fix(lib): harden issue workspace env reset flow

Author: skulidropek

packages/lib/src/core/templates-entrypoint/codex.ts

@@ -150,21 +150,21 @@ if [[ "$REPO_REF" == issue-* ]]; then
   if [[ "$REPO_URL" == https://github.com/* ]]; then
     ISSUE_REPO="$(printf "%s" "$REPO_URL" | sed -E 's#^https://github.com/##; s#[.]git$##; s#/*$##')"
     if [[ -n "$ISSUE_REPO" ]]; then
-      ISSUE_URL="https://github.com/\${ISSUE_REPO}/issues/\${ISSUE_ID}"
+      ISSUE_URL="https://github.com/$ISSUE_REPO/issues/$ISSUE_ID"
     fi
   fi
   if [[ -n "$ISSUE_URL" ]]; then
-    WORKSPACE_INFO_LINE="Контекст workspace: issue #\${ISSUE_ID} (\${ISSUE_URL})"
+    WORKSPACE_INFO_LINE="Контекст workspace: issue #$ISSUE_ID ($ISSUE_URL)"
   else
-    WORKSPACE_INFO_LINE="Контекст workspace: issue #\${ISSUE_ID}"
+    WORKSPACE_INFO_LINE="Контекст workspace: issue #$ISSUE_ID"
   fi
   ISSUE_AGENTS_HINT_LINE="Issue AGENTS.md: __TARGET_DIR__/AGENTS.md"
 elif [[ "$REPO_REF" == refs/pull/*/head ]]; then
   PR_ID="$(printf "%s" "$REPO_REF" | sed -E 's#^refs/pull/([0-9]+)/head$#\1#')"
   if [[ -n "$PR_ID" ]]; then
-    WORKSPACE_INFO_LINE="Контекст workspace: PR #\${PR_ID}"
+    WORKSPACE_INFO_LINE="Контекст workspace: PR #$PR_ID"
   else
-    WORKSPACE_INFO_LINE="Контекст workspace: pull request (\${REPO_REF})"
+    WORKSPACE_INFO_LINE="Контекст workspace: pull request ($REPO_REF)"
   fi
 fi
 if [[ ! -f "$AGENTS_PATH" ]]; then

packages/lib/src/core/templates-entrypoint/tasks.ts

@@ -21,14 +21,13 @@ rm -f "$CLONE_DONE_PATH" "$CLONE_FAIL_PATH"
 CLONE_OK=1`
 
 const renderCloneRemotes = (config: TemplateConfig): string =>
-  `if [[ "$CLONE_OK" -eq 1 && -n "$FORK_REPO_URL" && -d "$TARGET_DIR/.git" ]]; then
-  AUTH_FORK_URL="$FORK_REPO_URL"
-  if [[ -n "$GIT_AUTH_TOKEN" && "$FORK_REPO_URL" == https://* ]]; then
-    AUTH_FORK_URL="$(printf "%s" "$FORK_REPO_URL" | sed "s#^https://#https://\${GIT_AUTH_USER}:\${GIT_AUTH_TOKEN}@#")"
-  fi
-  if [[ "$FORK_REPO_URL" != "$REPO_URL" ]]; then
-    su - ${config.sshUser} -c "cd '$TARGET_DIR' && git remote set-url origin '$AUTH_FORK_URL'" || true
-    su - ${config.sshUser} -c "cd '$TARGET_DIR' && git remote add upstream '$AUTH_REPO_URL' 2>/dev/null || git remote set-url upstream '$AUTH_REPO_URL'" || true
+  `if [[ "$CLONE_OK" -eq 1 && -d "$TARGET_DIR/.git" ]]; then
+  if [[ -n "$FORK_REPO_URL" && "$FORK_REPO_URL" != "$REPO_URL" ]]; then
+    su - ${config.sshUser} -c "cd '$TARGET_DIR' && git remote set-url origin '$FORK_REPO_URL'" || true
+    su - ${config.sshUser} -c "cd '$TARGET_DIR' && git remote add upstream '$REPO_URL' 2>/dev/null || git remote set-url upstream '$REPO_URL'" || true
+  else
+    su - ${config.sshUser} -c "cd '$TARGET_DIR' && git remote set-url origin '$REPO_URL'" || true
+    su - ${config.sshUser} -c "cd '$TARGET_DIR' && git remote remove upstream >/dev/null 2>&1 || true" || true
   fi
 fi`
 
@@ -97,16 +96,19 @@ const renderIssueWorkspaceAgents = (): string =>
   if [[ "$REPO_URL" == https://github.com/* ]]; then
     ISSUE_REPO="$(printf "%s" "$REPO_URL" | sed -E 's#^https://github.com/##; s#[.]git$##; s#/*$##')"
     if [[ -n "$ISSUE_REPO" ]]; then
-      ISSUE_URL="https://github.com/\${ISSUE_REPO}/issues/\${ISSUE_ID}"
+      ISSUE_URL="https://github.com/$ISSUE_REPO/issues/$ISSUE_ID"
     fi
   fi
+  if [[ -z "$ISSUE_URL" ]]; then
+    ISSUE_URL="n/a"
+  fi
 
   ISSUE_AGENTS_PATH="$TARGET_DIR/AGENTS.md"
   if [[ ! -e "$ISSUE_AGENTS_PATH" ]]; then
     cat <<EOF > "$ISSUE_AGENTS_PATH"
 # docker-git issue workspace
-Issue workspace: #\${ISSUE_ID}
-Issue URL: \${ISSUE_URL:-n/a}
+Issue workspace: #$ISSUE_ID
+Issue URL: $ISSUE_URL
 Workspace path: $TARGET_DIR
 
 Работай только над этим issue, если пользователь не попросил другое.
@@ -128,11 +130,11 @@ const renderCloneBody = (config: TemplateConfig): string =>
   [
     renderCloneBodyStart(config),
     renderCloneBodyRef(config),
+    "fi",
     "",
     renderCloneRemotes(config),
     "",
-    renderIssueWorkspaceAgents(),
-    "fi"
+    renderIssueWorkspaceAgents()
   ].join("\n")
 
 const renderCloneFinalize = (): string =>

packages/lib/src/shell/command-runner.ts

@@ -55,14 +55,14 @@ export const runCommandWithExitCodes = <E>(
 // FORMAT THEOREM: forall cmd: exitCode(cmd) = n
 // PURITY: SHELL
 // EFFECT: Effect<number, PlatformError, CommandExecutor>
-// INVARIANT: stdout/stderr are inherited
+// INVARIANT: stdout/stderr are suppressed for status checks
 // COMPLEXITY: O(command)
 export const runCommandExitCode = (
   spec: RunCommandSpec
 ): Effect.Effect<number, PlatformError, CommandExecutor.CommandExecutor> =>
   Effect.map(
     Command.exitCode(
-      buildCommand(spec, "inherit", "inherit", "inherit")
+      buildCommand(spec, "pipe", "pipe", "inherit")
     ),
     Number
   )