mirror of
https://github.com/Ark0N/Codeman.git
synced 2026-10-06 15:39:41 +02:00
review fixes: every claude create path routes through the workspace-hooks decision
Post-#304 follow-ups. The install-vs-refresh decision (workspaceHooksEnabled, default ON) moved from a session-routes-local helper into hooks-config.ts as applyWorkspaceHooks(workspace, install?), and the claude session-create sites that bypassed it now go through it: cron job fires (cron-service), legacy scheduled-run iterations (runScheduledLoop), and the plan-orchestrator research and planner one-shots. A cron or scheduled run firing in a linked case that never had an interactive session ran hook-blind (no stop for completion detection, no tab alert on a blocking dialog). The shared core also carries the two guards every caller needs: a workspace that no longer exists is skipped (ensureCodemanHooks mkdir -p's, so the boot recovery sweep used to resurrect a deleted repo as an empty tree holding only .claude/settings.local.json), and all errors are swallowed since a create must never fail on hooks. Route handlers keep resolving the setting through their ConfigPort and pass it in; non-route callers omit it and the core reads settings.json itself (absent key or unreadable file = ON). Two adjacent gates tightened in session-routes: - the docker quick-start hooks branch excluded the five external CLIs but let `shell` through, contradicting its own rule that only claude reads .claude hooks; it is now gated on mode === 'claude' - the statusLine exporter call in POST /api/sessions got the same !remote && body.workingDir guard the hooks call got in499d355(it mkdirs the same way, so a remote attach created a junk user@host:session dir locally and a cwd-fallback create wrote into $HOME) plan-routes' one-shot deliberately stays out: its workingDir is process.cwd(), exactly the target499d355forbids writing into. restoreMuxSessions stays out too: the boot sweep already covers recovered workspaces. Tests: quick-start existing-case install, docker claude-installs/shell-does-not, and the core directly (default-ON install, OFF add-nothing, OFF still heals a stale block, malformed file untouched, vanished workspace skipped); the remote and cwd-fallback regressions now also send statusLineTelemetry:true to pin the statusLine guard. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
+61
-1
@@ -10,8 +10,9 @@
|
||||
* Key exports:
|
||||
* - `generateHooksConfig()` — returns hooks object for settings.local.json
|
||||
* - `writeHooksConfig(casePath)` — writes hooks + env config to disk
|
||||
* - `applyWorkspaceHooks(workspace, install?)` — the ONE install-vs-refresh decision
|
||||
* point every claude-session create path routes through (see its doc comment)
|
||||
* - `ensureCodemanHooks(casePath)` — safely installs/updates hooks for a managed case
|
||||
* (no production call site yet; see its doc comment before wiring one)
|
||||
* - `updateCaseEnvVars(casePath, envVars)` — merges env vars into settings
|
||||
*
|
||||
* Hook events generated: `idle_prompt`, `permission_prompt`, `elicitation_dialog`,
|
||||
@@ -37,6 +38,7 @@ import { fileURLToPath } from 'node:url';
|
||||
|
||||
import type { HookEventType } from './types.js';
|
||||
import { HOOK_TIMEOUT_SECONDS } from './config/auth-config.js';
|
||||
import { dataPath } from './config/instance.js';
|
||||
|
||||
/**
|
||||
* Serializes read-modify-write access to a `settings.local.json` path. Every
|
||||
@@ -747,6 +749,64 @@ export async function refreshStaleCodemanHooks(casePath: string): Promise<void>
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Hooks for the workspace a Claude session is about to run in. ONE decision point,
|
||||
* shared by every claude-session create path — the interactive routes, quick-start,
|
||||
* cron fires, legacy scheduled runs, the plan-orchestrator one-shots, and the boot
|
||||
* recovery sweep — so the `workspaceHooksEnabled` setting cannot apply to some of
|
||||
* them only.
|
||||
*
|
||||
* ON (the default): INSTALL Codeman's hooks block (`ensureCodemanHooks`), merging so
|
||||
* a user's own hook entries and every other settings key survive. Hooks used to be
|
||||
* written only when Codeman CREATED the case DIRECTORY, so a linked case or any
|
||||
* pre-existing repo — where most sessions actually run — had none, and every
|
||||
* hook-driven surface was silently dead there (full history on `ensureCodemanHooks`).
|
||||
*
|
||||
* OFF: the older, narrower behavior. A Codeman block that is already there is still
|
||||
* refreshed when stale (COD-91: a pre-secret block 401s once the hook-secret gate
|
||||
* went unconditional), but one is never added, so Codeman leaves the repo alone.
|
||||
*
|
||||
* `install` overrides the setting read: route handlers resolve it through their
|
||||
* ConfigPort (`ctx.getWorkspaceHooksEnabled()`, which tests stub), and the boot sweep
|
||||
* passes `true` after checking the setting once for its whole batch. Every other
|
||||
* caller omits it and the synced setting is read from settings.json here — default ON
|
||||
* when the key is absent or the file unreadable, matching the server's resolver.
|
||||
*
|
||||
* Callers gate on their own context (claude mode only; local — never a remote
|
||||
* workingDir, which is a path on ANOTHER host, and never a docker case that opted
|
||||
* out of hooks). The guards EVERY caller needs live here instead:
|
||||
* - a workspace that does not exist is skipped — `ensureCodemanHooks` mkdir -p's,
|
||||
* so a deleted repo whose tmux session survived would otherwise be resurrected
|
||||
* as an empty directory tree holding only `.claude/settings.local.json`;
|
||||
* - errors are swallowed — a session create must never fail on hooks.
|
||||
*/
|
||||
export async function applyWorkspaceHooks(workspace: string, install?: boolean): Promise<void> {
|
||||
try {
|
||||
if (!existsSync(workspace)) return;
|
||||
const shouldInstall = install ?? (await readWorkspaceHooksEnabled());
|
||||
await (shouldInstall ? ensureCodemanHooks(workspace) : refreshStaleCodemanHooks(workspace));
|
||||
} catch {
|
||||
// Best-effort by contract (see doc comment): hooks degrade to output-based
|
||||
// idle detection; the create goes ahead.
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The synced `workspaceHooksEnabled` app setting, read straight from settings.json
|
||||
* for callers that live outside the web layer (cron, scheduled runs, the plan
|
||||
* orchestrator). Default ON: an absent key means a user who has never seen the
|
||||
* setting, and OFF for them would mean no tab alerts, no Approvals Inbox and no
|
||||
* respawn idle signals in every workspace Codeman did not scaffold itself.
|
||||
*/
|
||||
async function readWorkspaceHooksEnabled(): Promise<boolean> {
|
||||
try {
|
||||
const parsed = JSON.parse(await readFile(dataPath('settings.json'), 'utf-8')) as Record<string, unknown>;
|
||||
return parsed.workspaceHooksEnabled !== false;
|
||||
} catch {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/** Unique marker identifying Codeman's own statusLine command (vs a user's). */
|
||||
const STATUSLINE_MARKER = '/api/status-telemetry';
|
||||
|
||||
|
||||
Reference in New Issue
Block a user