Merge origin/main into issue-232

Author: skulidropek

.changeset/tidy-session-sync-tool.md

@@ -3,4 +3,4 @@
 "@prover-coder-ai/docker-git": patch
 ---
 
-Extract AI agent session synchronization into a standalone docker-git-session-sync package.
+Publish docker-git-session-sync as a public npm CLI and install it for post-push session backup comments, with a local Docker build fallback before first publish.

packages/app/eslint.config.mts

@@ -326,6 +326,21 @@ export default defineConfig(
       'sonarjs/no-empty-test-file': 'off',
     },
   },
+  {
+    files: [
+      "src/docker-git/menu-create-shared.ts",
+      "src/web/app-ready-terminal-screen.tsx",
+      "src/web/panel-content.tsx",
+      "src/web/panel-create-select.tsx",
+      "src/web/panel-project-details.tsx",
+      "src/web/panel-terminal.tsx",
+      "src/web/terminal-panel-runtime-core.ts",
+    ],
+    rules: {
+      "max-lines": "off",
+      "max-lines-per-function": "off",
+    },
+  },
 
   // 3) Для JS-файлов отключим типо-зависимые проверки
   {

packages/app/src/docker-git/menu-create-shared.ts

@@ -19,36 +19,27 @@ export type CreateFlowContext = {
   readonly projectsRoot?: string | undefined
 }
 
-type TokenQuote = "'" | "\""
-
-type TokenizerState = {
-  current: string
-  escaping: boolean
-  quote: TokenQuote | null
-  readonly tokens: Array<string>
-}
-
 export type CreateFlowView = {
   readonly step: number
   readonly buffer: string
   readonly values: Partial<CreateInputs>
 }
 
-export type AdvanceCreateFlowResult =
+type AdvanceCreateFlowResult =
   | { readonly _tag: "Continue"; readonly view: CreateFlowView }
   | { readonly _tag: "Error"; readonly error: ParseError }
   | { readonly _tag: "Complete"; readonly inputs: CreateInputs }
 
-type AdvanceCreateFlowOptions = {
-  readonly quickCreate?: boolean
-}
-
 type AdvanceCreateFlowHandlers = {
   readonly onComplete: (inputs: CreateInputs) => void
   readonly onContinue: (view: CreateFlowView) => void
   readonly onError: (error: ParseError) => void
 }
 
+type AdvanceCreateFlowOptions = {
+  readonly quickCreate?: boolean
+}
+
 const trimLeftSlash = (value: string): string => {
   let start = 0
   while (start < value.length && value[start] === "/") {
@@ -154,22 +145,21 @@ const createParseError = (reason: string): ParseError => ({
   reason
 })
 
-const pushCreateToken = (state: TokenizerState): void => {
+type CreateTokenizeState = {
+  current: string
+  escaping: boolean
+  quote: "'" | "\"" | null
+  readonly tokens: Array<string>
+}
+
+const pushCreateToken = (state: CreateTokenizeState): void => {
   if (state.current.length > 0) {
     state.tokens.push(state.current)
     state.current = ""
   }
 }
 
-const consumeQuotedCreateTokenChar = (state: TokenizerState, char: string): void => {
-  if (char === state.quote) {
-    state.quote = null
-    return
-  }
-  state.current += char
-}
-
-const consumeCreateTokenChar = (state: TokenizerState, char: string): void => {
+const consumeCreateTokenChar = (state: CreateTokenizeState, char: string): void => {
   if (state.escaping) {
     state.current += char
     state.escaping = false
@@ -180,7 +170,11 @@ const consumeCreateTokenChar = (state: TokenizerState, char: string): void => {
     return
   }
   if (state.quote !== null) {
-    consumeQuotedCreateTokenChar(state, char)
+    if (char === state.quote) {
+      state.quote = null
+      return
+    }
+    state.current += char
     return
   }
   if (char === "'" || char === "\"") {
@@ -197,7 +191,7 @@ const consumeCreateTokenChar = (state: TokenizerState, char: string): void => {
 const tokenizeCreateCommandLine = (
   input: string
 ): Either.Either<ReadonlyArray<string>, ParseError> => {
-  const state: TokenizerState = { current: "", escaping: false, quote: null, tokens: [] }
+  const state: CreateTokenizeState = { current: "", escaping: false, quote: null, tokens: [] }
 
   for (const char of input.trim()) {
     consumeCreateTokenChar(state, char)
@@ -259,22 +253,40 @@ const normalizeCreateTokens = (
   return Either.right(withoutBinary)
 }
 
+type RawCreateOptions = Parameters<typeof buildCreateCommand>[0]
+
+const cpuLimitCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.cpuLimit === undefined ? {} : { cpuLimit: command.config.cpuLimit ?? "" }
+
+const ramLimitCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.ramLimit === undefined ? {} : { ramLimit: command.config.ramLimit ?? "" }
+
+const runUpCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.up === undefined ? {} : { runUp: command.runUp }
+
+const playwrightCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.enableMcpPlaywright === undefined ? {} : { enableMcpPlaywright: command.config.enableMcpPlaywright }
+
+const forceCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.force === undefined ? {} : { force: command.force }
+
+const forceEnvCreateInput = (raw: RawCreateOptions, command: CreateCommand): Partial<CreateInputs> =>
+  raw.forceEnv === undefined ? {} : { forceEnv: command.forceEnv }
+
 const createInputsFromCommand = (
   repoUrl: string,
-  raw: Parameters<typeof buildCreateCommand>[0],
+  raw: RawCreateOptions,
   command: CreateCommand
 ): Partial<CreateInputs> => ({
   repoUrl,
   repoRef: command.config.repoRef,
   outDir: command.outDir,
-  ...(raw.cpuLimit === undefined ? {} : { cpuLimit: command.config.cpuLimit ?? "" }),
-  ...(raw.ramLimit === undefined ? {} : { ramLimit: command.config.ramLimit ?? "" }),
-  ...(raw.up === undefined ? {} : { runUp: command.runUp }),
-  ...(raw.enableMcpPlaywright === undefined
-    ? {}
-    : { enableMcpPlaywright: command.config.enableMcpPlaywright }),
-  ...(raw.force === undefined ? {} : { force: command.force }),
-  ...(raw.forceEnv === undefined ? {} : { forceEnv: command.forceEnv })
+  ...cpuLimitCreateInput(raw, command),
+  ...ramLimitCreateInput(raw, command),
+  ...runUpCreateInput(raw, command),
+  ...playwrightCreateInput(raw, command),
+  ...forceCreateInput(raw, command),
+  ...forceEnvCreateInput(raw, command)
 })
 
 const parseRepoStepInput = (
@@ -304,7 +316,10 @@ const parseRepoStepInput = (
   })
 }
 
-const createStepApplied = (): Either.Either<true, ParseError> => Either.right(true)
+const createStepApplied = (): Either.Either<true, ParseError> => {
+  const applied = true
+  return Either.right(applied)
+}
 
 const hasOwn = (values: Partial<CreateInputs>, key: keyof CreateInputs): boolean =>
   Object.prototype.hasOwnProperty.call(values, key)

packages/app/src/docker-git/menu-create.ts

@@ -142,7 +142,8 @@ const handleCreateReturn = (
   context: CreateReturnContext,
   quickCreate = false
 ) => {
-  handleAdvanceCreateFlowResult(advanceCreateFlow(context.state.cwd, context.view, { quickCreate }), {
+  const next = advanceCreateFlow(context.state.cwd, context.view, { quickCreate })
+  handleAdvanceCreateFlowResult(next, {
     onComplete: (inputs) => {
       finalizeCreateFlow({
         state: context.state,

packages/app/src/docker-git/menu-render.ts

@@ -70,6 +70,15 @@ type MenuRenderInput = {
   readonly message: string | null
 }
 
+type CreateRenderInput = {
+  readonly buffer: string
+  readonly defaults: CreateInputs
+  readonly label: string
+  readonly message: string | null
+  readonly stepIndex: number
+  readonly steps: ReadonlyArray<CreateStep>
+}
+
 export const renderMenu = (input: MenuRenderInput): React.ReactElement => {
   const { activeDir, busy, cwd, message, runningDockerGitContainers, selected } = input
   const el = React.createElement
@@ -108,14 +117,8 @@ export const renderMenu = (input: MenuRenderInput): React.ReactElement => {
   )
 }
 
-export const renderCreate = (
-  label: string,
-  buffer: string,
-  message: string | null,
-  stepIndex: number,
-  defaults: CreateInputs,
-  steps: ReadonlyArray<CreateStep>
-): React.ReactElement => {
+export const renderCreate = (input: CreateRenderInput): React.ReactElement => {
+  const { buffer, defaults, label, message, stepIndex, steps } = input
   const el = React.createElement
   const hint = stepIndex === 0
     ? "Enter = next, Shift+Enter = quick create, Esc = cancel."

packages/app/src/docker-git/menu.ts

@@ -62,7 +62,14 @@ const renderView = (context: RenderContext) => {
     const step = steps[context.view.step] ?? "repoUrl"
     const label = renderCreateStepLabel(step, currentDefaults)
 
-    return renderCreate(label, context.view.buffer, context.message, context.view.step, currentDefaults, steps)
+    return renderCreate({
+      buffer: context.view.buffer,
+      defaults: currentDefaults,
+      label,
+      message: context.message,
+      stepIndex: context.view.step,
+      steps
+    })
   }
 
   if (context.view._tag === "AuthMenu") {

packages/app/src/lib/core/templates.ts

@@ -14,7 +14,7 @@ const renderGitignore = (): string =>
   `# docker-git project files
 # NOTE: bootstrap secrets stay local-only and should not be committed.
 
-# docker-git scripts/tools (copied from workspace, rebuilt on each project update)
+# docker-git scripts/tools (scripts plus local session-sync fallback)
 scripts/
 .docker-git-tools/
 

packages/app/src/lib/core/templates/dockerfile.ts

@@ -134,6 +134,8 @@ RUN ARCH="$(uname -m)" \
   && chmod +x /usr/local/bin/gitleaks \
   && gitleaks version`
 
+const dockerGitSessionSyncPackage = "@prover-coder-ai/docker-git-session-sync@latest"
+
 const dockerfilePlaywrightMcpBlock = String.raw`RUN npm install -g @playwright/mcp@latest
 
 # docker-git: wrapper that waits for the guarded CDP endpoint before launching Playwright MCP.
@@ -264,9 +266,9 @@ RUN printf "%s\\n" \
   "AllowUsers ${config.sshUser}" \
   > /etc/ssh/sshd_config.d/${config.sshUser}.conf`
 
-// CHANGE: add docker-git scripts and session sync tool to Docker image
-// WHY: git hooks need embedded scripts, while session sync is provided by a standalone tool
-// REF: issue-176
+// CHANGE: add docker-git scripts and install the published session sync CLI
+// WHY: git hooks need embedded scripts, while session sync should come from npmjs when available
+// REF: issue-176, issue-235
 // PURITY: CORE (pure template renderer)
 // INVARIANT: scripts are accessible under /opt/docker-git/scripts and session sync under PATH
 const renderDockerfileScripts = (): string =>
@@ -276,8 +278,16 @@ RUN find /opt/docker-git/scripts -type f -name '*.sh' -exec chmod +x {} + \
   && find /opt/docker-git/scripts -type f -name '*.js' -exec chmod +x {} +
 
 # docker-git standalone tools
-COPY .docker-git-tools/docker-git-session-sync /usr/local/bin/docker-git-session-sync
-RUN chmod +x /usr/local/bin/docker-git-session-sync`
+ARG DOCKER_GIT_SESSION_SYNC_PACKAGE="${dockerGitSessionSyncPackage}"
+COPY .docker-git-tools/docker-git-session-sync /opt/docker-git/tools/docker-git-session-sync
+RUN set -eu; \
+  if npm install -g "$DOCKER_GIT_SESSION_SYNC_PACKAGE"; then \
+    docker-git-session-sync --help >/dev/null; \
+  else \
+    echo "docker-git: npm install of $DOCKER_GIT_SESSION_SYNC_PACKAGE failed; using local session sync fallback" >&2; \
+    install -m 0755 /opt/docker-git/tools/docker-git-session-sync /usr/local/bin/docker-git-session-sync; \
+    docker-git-session-sync --help >/dev/null; \
+  fi`
 
 const renderDockerfileWorkspace = (config: TemplateConfig): string =>
   `# Workspace path (supports root-level dirs like /repo)

packages/app/src/lib/shell/files.ts

@@ -175,12 +175,13 @@ const sessionSyncToolCandidates = (
     return installed === null ? [workspaceCandidate] : [workspaceCandidate, installed]
   })
 
-// CHANGE: provision standalone session sync tool into the Docker build context
-// WHY: generated containers call docker-git-session-sync directly after git push
-// REF: issue-230
+// CHANGE: provision local session sync fallback into the Docker build context
+// WHY: generated Dockerfiles install the published npm package first, but CI before first publish
+//      and offline rebuilds still need a deterministic executable fallback
+// REF: issue-230, issue-235
 // PURITY: SHELL
 // EFFECT: Effect<void, PlatformError, FileSystem | Path>
-// INVARIANT: target executable exists before Dockerfile COPY is evaluated
+// INVARIANT: fallback executable exists before Dockerfile COPY is evaluated
 // COMPLEXITY: O(k) where k = candidate tool locations
 const provisionDockerGitSessionSyncTool = (
   fs: FileSystem.FileSystem,

packages/app/src/web/app-ready-create.ts

@@ -49,19 +49,6 @@ export const setCreateBuffer = (
   setCreateView({ ...createView, buffer })
 }
 
-const showCreateFlowError = (context: BrowserActionContext, error: Parameters<typeof formatParseError>[0]): void => {
-  context.setMessage(formatParseError(error))
-}
-
-const continueBrowserCreateFlow = (
-  context: BrowserActionContext,
-  setCreateView: Setter<CreateFlowView>,
-  view: CreateFlowView
-): void => {
-  setCreateView(view)
-  context.setMessage(null)
-}
-
 export const submitCreateView = (
   {
     context,
@@ -81,15 +68,16 @@ export const submitCreateView = (
     ? advanceCreateFlow(createContext, createView)
     : advanceCreateFlow(createContext, createView, { quickCreate })
   handleAdvanceCreateFlowResult(next, {
-    onComplete: (inputs) => {
-      submitCreateInputs(inputs, context)
-      setCreateView(resetCreateView())
+    onError: (error) => {
+      context.setMessage(formatParseError(error))
     },
     onContinue: (view) => {
-      continueBrowserCreateFlow(context, setCreateView, view)
+      setCreateView(view)
+      context.setMessage(null)
     },
-    onError: (error) => {
-      showCreateFlowError(context, error)
+    onComplete: (inputs) => {
+      submitCreateInputs(inputs, context)
+      setCreateView(resetCreateView())
     }
   })
 }