refactor(lib): replace __PLACEHOLDER__ with direct ${} interpolation

skulidropek · claude · skulidropek · commit 56240566a192 · 2026-03-24T15:09:22.000Z
- claude-system-prompt.ts: single clean template string via
  renderSharedPrompt(targetDir, workspaceContext) with ${} params;
  export PROMPT_* constants + renderFocusLine() for Codex
- claude-extra-config.ts: renderClaudeGlobalPromptSetup() builds bash
  script inline — no module-level template, no .replaceAll() chains
- gemini.ts: renderEntrypointGeminiNotice() same approach
- codex.ts: FOCUS_LINE uses renderFocusLine() via __FOCUS_LINE__ stub
  (kept because the 100-line managed-block template stays module-level)

Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/packages/lib/src/core/templates-entrypoint/claude-extra-config.ts b/packages/lib/src/core/templates-entrypoint/claude-extra-config.ts
@@ -1,13 +1,27 @@
 import type { TemplateConfig } from "../domain.js"
 import { renderSharedPrompt } from "./claude-system-prompt.js"
 
-const entrypointClaudeGlobalPromptTemplate = String
-  .raw`# Claude Code: managed global memory (CLAUDE.md is auto-loaded by Claude Code)
-CLAUDE_GLOBAL_PROMPT_FILE="/home/__SSH_USER__/.claude/CLAUDE.md"
+const escapeForDoubleQuotes = (value: string): string => {
+  const backslash = String.fromCodePoint(92)
+  const quote = String.fromCodePoint(34)
+  const escapedBackslash = `${backslash}${backslash}`
+  const escapedQuote = `${backslash}${quote}`
+  return value
+    .replaceAll(backslash, escapedBackslash)
+    .replaceAll(quote, escapedQuote)
+}
+
+export const renderClaudeGlobalPromptSetup = (config: TemplateConfig): string => {
+  const promptContent = renderSharedPrompt(config.targetDir, "$CLAUDE_WORKSPACE_CONTEXT")
+  const repoRefDefault = escapeForDoubleQuotes(config.repoRef)
+  const repoUrlDefault = escapeForDoubleQuotes(config.repoUrl)
+
+  return String.raw`# Claude Code: managed global memory (CLAUDE.md is auto-loaded by Claude Code)
+CLAUDE_GLOBAL_PROMPT_FILE="/home/${config.sshUser}/.claude/CLAUDE.md"
 CLAUDE_AUTO_SYSTEM_PROMPT="${"$"}{CLAUDE_AUTO_SYSTEM_PROMPT:-1}"
 CLAUDE_WORKSPACE_CONTEXT="Контекст workspace: repository"
-REPO_REF_VALUE="${"$"}{REPO_REF:-__REPO_REF_DEFAULT__}"
-REPO_URL_VALUE="${"$"}{REPO_URL:-__REPO_URL_DEFAULT__}"
+REPO_REF_VALUE="${"$"}{REPO_REF:-${repoRefDefault}}"
+REPO_URL_VALUE="${"$"}{REPO_URL:-${repoUrlDefault}}"
 
 if [[ "$REPO_REF_VALUE" == issue-* ]]; then
   ISSUE_ID_VALUE="$(printf "%s" "$REPO_REF_VALUE" | sed -E 's#^issue-##')"
@@ -47,7 +61,7 @@ if [[ "$CLAUDE_AUTO_SYSTEM_PROMPT" == "1" ]]; then
   if [[ ! -f "$CLAUDE_GLOBAL_PROMPT_FILE" ]] || grep -q "^<!-- docker-git-managed:claude-md -->$" "$CLAUDE_GLOBAL_PROMPT_FILE"; then
     cat <<EOF > "$CLAUDE_GLOBAL_PROMPT_FILE"
 <!-- docker-git-managed:claude-md -->
-${renderSharedPrompt("$CLAUDE_WORKSPACE_CONTEXT")}
+${promptContent}
 <!-- /docker-git-managed:claude-md -->
 EOF
     chmod 0644 "$CLAUDE_GLOBAL_PROMPT_FILE" || true
@@ -56,24 +70,8 @@ EOF
 fi
 
 export CLAUDE_AUTO_SYSTEM_PROMPT`
-
-const escapeForDoubleQuotes = (value: string): string => {
-  const backslash = String.fromCodePoint(92)
-  const quote = String.fromCodePoint(34)
-  const escapedBackslash = `${backslash}${backslash}`
-  const escapedQuote = `${backslash}${quote}`
-  return value
-    .replaceAll(backslash, escapedBackslash)
-    .replaceAll(quote, escapedQuote)
 }
 
-export const renderClaudeGlobalPromptSetup = (config: TemplateConfig): string =>
-  entrypointClaudeGlobalPromptTemplate
-    .replaceAll("__TARGET_DIR__", config.targetDir)
-    .replaceAll("__SSH_USER__", config.sshUser)
-    .replaceAll("__REPO_REF_DEFAULT__", escapeForDoubleQuotes(config.repoRef))
-    .replaceAll("__REPO_URL_DEFAULT__", escapeForDoubleQuotes(config.repoUrl))
-
 export const renderClaudeWrapperSetup = (): string =>
   String.raw`CLAUDE_WRAPPER_BIN="/usr/local/bin/claude"
 if command -v claude >/dev/null 2>&1; then
diff --git a/packages/lib/src/core/templates-entrypoint/claude-system-prompt.ts b/packages/lib/src/core/templates-entrypoint/claude-system-prompt.ts
@@ -1,48 +1,42 @@
 /**
- * Shared system prompt injected into every agent (Claude, Gemini, Codex).
+ * Single source of truth for the agent system prompt.
+ * Edit this file to change behaviour across all providers (Claude, Gemini, Codex).
  *
- * Edit this file to change the global agent behaviour across all providers.
- *
- * Placeholders resolved at TypeScript render time:
- *   __TARGET_DIR__   – absolute path to the cloned repo inside the container
- *
- * Placeholders resolved at container start-up (bash):
- *   workspaceContextBashVar – per-agent bash variable reference passed to
- *                             renderSharedPrompt(), e.g. "$CLAUDE_WORKSPACE_CONTEXT"
+ * @param targetDir       – absolute path to the repo inside the container
+ * @param workspaceContext – bash variable reference resolved at container start-up,
+ *                          e.g. "$CLAUDE_WORKSPACE_CONTEXT"
  */
 
-export const PROMPT_INTRO =
+const INTRO =
   `Ты автономный агент, который имеет полностью все права управления контейнером. ` +
   `У тебя есть доступ к командам sudo, gh, codex, opencode, oh-my-opencode, sshpass, ` +
   `claude, gemini, git, node, pnpm и всем остальным другим. ` +
   `Проекты с которыми идёт работа лежат по пути ~`
 
-export const PROMPT_INTERNET =
+const INTERNET =
   `Доступ к интернету: есть. Если чего-то не знаешь — ищи в интернете или по кодовой базе.`
 
-export const PROMPT_SUBAGENTS =
+const SUBAGENTS =
   `Для решения задач обязательно используй subagents. ` +
   `Сам агент обязан выполнять финальную проверку, интеграцию и валидацию результата перед ответом пользователю.`
 
-export const PROMPT_FILES =
+const FILES =
   `Если ты видишь файлы AGENTS.md, GEMINI.md или CLAUDE.md внутри проекта, ты обязан их читать и соблюдать инструкции.`
 
-/**
- * Builds the full prompt string for heredoc injection (Claude, Gemini).
- *
- * @param workspaceContextBashVar – bash variable reference that will be
- *   interpolated at container start-up, e.g. "$CLAUDE_WORKSPACE_CONTEXT"
- *
- * __TARGET_DIR__ is left as-is and replaced by each agent's render function.
- */
-export const renderSharedPrompt = (workspaceContextBashVar: string): string =>
-  [
-    PROMPT_INTRO,
-    `Рабочая папка проекта (git clone): __TARGET_DIR__`,
-    `Доступные workspace пути: __TARGET_DIR__`,
-    workspaceContextBashVar,
-    `Фокус задачи: работай только в workspace, который запрашивает пользователь. Текущий workspace: __TARGET_DIR__`,
-    PROMPT_INTERNET,
-    PROMPT_SUBAGENTS,
-    PROMPT_FILES,
-  ].join("\n")
+// Used by Codex's bash-variable injection pattern
+export const PROMPT_INTRO = INTRO
+export const PROMPT_INTERNET = INTERNET
+export const PROMPT_SUBAGENTS = SUBAGENTS
+export const PROMPT_FILES = FILES
+export const renderFocusLine = (targetDir: string): string =>
+  `Фокус задачи: работай только в workspace, который запрашивает пользователь. Текущий workspace: ${targetDir}`
+
+export const renderSharedPrompt = (targetDir: string, workspaceContext: string): string =>
+  `${INTRO}
+Рабочая папка проекта (git clone): ${targetDir}
+Доступные workspace пути: ${targetDir}
+${workspaceContext}
+${renderFocusLine(targetDir)}
+${INTERNET}
+${SUBAGENTS}
+${FILES}`
diff --git a/packages/lib/src/core/templates-entrypoint/codex.ts b/packages/lib/src/core/templates-entrypoint/codex.ts
@@ -1,5 +1,5 @@
 import type { TemplateConfig } from "../domain.js"
-import { PROMPT_FILES, PROMPT_INTERNET, PROMPT_INTRO, PROMPT_SUBAGENTS } from "./claude-system-prompt.js"
+import { PROMPT_FILES, PROMPT_INTERNET, PROMPT_INTRO, PROMPT_SUBAGENTS, renderFocusLine } from "./claude-system-prompt.js"
 
 export { renderEntrypointCodexResumeHint } from "./codex-resume-hint.js"
 
@@ -128,7 +128,7 @@ LEGACY_AGENTS_PATH="/home/__SSH_USER__/AGENTS.md"
 PROJECT_LINE="Рабочая папка проекта (git clone): __TARGET_DIR__"
 WORKSPACES_LINE="Доступные workspace пути: __TARGET_DIR__"
 WORKSPACE_INFO_LINE="Контекст workspace: repository"
-FOCUS_LINE="Фокус задачи: работай только в workspace, который запрашивает пользователь. Текущий workspace: __TARGET_DIR__"
+FOCUS_LINE="__FOCUS_LINE__"
 INTERNET_LINE="${PROMPT_INTERNET}"
 SUBAGENTS_LINE="${PROMPT_SUBAGENTS}"
 if [[ "$REPO_REF" == issue-* ]]; then
@@ -230,7 +230,8 @@ if [[ -f "$LEGACY_AGENTS_PATH" && -f "$AGENTS_PATH" ]]; then
 fi`
 
 export const renderEntrypointAgentsNotice = (config: TemplateConfig): string =>
-  entrypointAgentsNoticeTemplate.replaceAll("__CODEX_HOME__", config.codexHome).replaceAll(
-    "__SSH_USER__",
-    config.sshUser
-  ).replaceAll("__TARGET_DIR__", config.targetDir)
+  entrypointAgentsNoticeTemplate
+    .replaceAll("__CODEX_HOME__", config.codexHome)
+    .replaceAll("__SSH_USER__", config.sshUser)
+    .replaceAll("__TARGET_DIR__", config.targetDir)
+    .replaceAll("__FOCUS_LINE__", renderFocusLine(config.targetDir))
diff --git a/packages/lib/src/core/templates-entrypoint/gemini.ts b/packages/lib/src/core/templates-entrypoint/gemini.ts
@@ -230,8 +230,11 @@ docker_git_upsert_ssh_env "GEMINI_CLI_DISABLE_UPDATE_CHECK" "true"
 docker_git_upsert_ssh_env "GEMINI_CLI_NONINTERACTIVE" "true"
 docker_git_upsert_ssh_env "GEMINI_CLI_APPROVAL_MODE" "yolo"`
 
-const entrypointGeminiNoticeTemplate = String.raw`# Ensure global GEMINI.md exists for container context
-GEMINI_MD_PATH="__GEMINI_HOME__/GEMINI.md"
+const renderEntrypointGeminiNotice = (config: TemplateConfig): string => {
+  const promptContent = renderSharedPrompt(config.targetDir, "$GEMINI_WORKSPACE_CONTEXT")
+
+  return String.raw`# Ensure global GEMINI.md exists for container context
+GEMINI_MD_PATH="${config.geminiHome}/GEMINI.md"
 GEMINI_WORKSPACE_CONTEXT="Контекст workspace: repository"
 if [[ "$REPO_REF" == issue-* ]]; then
   ISSUE_ID="$(printf "%s" "$REPO_REF" | sed -E 's#^issue-##')"
@@ -267,15 +270,11 @@ fi
 
 cat <<EOF > "$GEMINI_MD_PATH"
 <!-- docker-git-managed:gemini-md -->
-${renderSharedPrompt("$GEMINI_WORKSPACE_CONTEXT")}
+${promptContent}
 <!-- /docker-git-managed:gemini-md -->
 EOF
 chown 1000:1000 "$GEMINI_MD_PATH" || true`
-
-const renderEntrypointGeminiNotice = (config: TemplateConfig): string =>
-  entrypointGeminiNoticeTemplate
-    .replaceAll("__GEMINI_HOME__", config.geminiHome)
-    .replaceAll("__TARGET_DIR__", config.targetDir)
+}
 
 export const renderEntrypointGeminiConfig = (config: TemplateConfig): string =>
   [
