compact-agent 1.28.0 → 1.28.2

package/bin/ecc-hooks.cjs

@@ -19,13 +19,31 @@
 
 const checkName = process.argv[2] || '';
 
+// Parse the tool-input env var. Previously a parse failure silently
+// fell back to `{}`, which makes every per-file check return ok() at
+// its empty-path guard — i.e. a malformed payload was a free bypass.
+// Now: empty/unset is treated as `{}` (legitimate for events that
+// don't carry input, like SessionStart); a NON-empty payload that
+// fails to parse is treated as a security event and the hook
+// blocks. Fail closed > fail open.
+const rawToolInput = process.env.COMPACT_AGENT_TOOL_INPUT || process.env.CROWCODER_TOOL_INPUT || '';
 let toolInput = {};
-try {
-  toolInput = JSON.parse(process.env.CROWCODER_TOOL_INPUT || '{}');
-} catch { /* ignore — leave as {} */ }
+if (rawToolInput.length > 0) {
+  try {
+    toolInput = JSON.parse(rawToolInput);
+  } catch {
+    process.stderr.write('[ECC] BLOCKED: tool input env var was not valid JSON.\n');
+    process.exit(2);
+  }
+}
 
-const tool = process.env.CROWCODER_TOOL || '';
-const cwd = process.env.CROWCODER_CWD || process.cwd();
+// Both env-var names accepted. COMPACT_AGENT_* is the post-rebrand
+// primary; CROWCODER_* is the legacy alias kept for back-compat with
+// user-written wrappers that haven't migrated. The parent process
+// exports both via src/hooks.ts so either form works regardless of
+// which the user's shell or wrapper set.
+const tool = process.env.COMPACT_AGENT_TOOL || process.env.CROWCODER_TOOL || '';
+const cwd = process.env.COMPACT_AGENT_CWD || process.env.CROWCODER_CWD || process.cwd();
 
 // ── Helpers ─────────────────────────────────────────────
 function bashCommand() {
@@ -73,6 +91,19 @@ const checks = {
     if (/(^|\s)--no-gpg-sign(\s|$)/.test(cmd)) {
       return block('`--no-gpg-sign` bypasses signing — ask the user first.');
     }
+    // `git commit -n` is the short form of --no-verify. The previous
+    // regex missed it entirely. Scope the check to `git commit`
+    // specifically — `-n` in other git subcommands means different
+    // things (e.g. `git log -n 5` = limit count, NOT skip hooks).
+    if (/\bgit\s+(?:commit|merge|rebase)\b[^|;&]*\s-n(\s|$)/.test(cmd)) {
+      return block('`-n` is the short form of `--no-verify` — fix the failing hook instead.');
+    }
+    // `-c core.hooksPath=/dev/null` (or similar) disables git hooks
+    // entirely without using --no-verify. Catches the documented
+    // bypass vector even when --no-verify isn't on the command line.
+    if (/\bgit\s+-c\s+core\.hooksPath\s*=/i.test(cmd)) {
+      return block('`-c core.hooksPath=…` disables git hooks — fix the failure instead.');
+    }
     return ok();
   },
 
@@ -207,7 +238,16 @@ const checks = {
       if (!fs.existsSync(targetPath)) return ok();
     } catch { /* if statSync fails, fall through to the normal path */ }
 
-    const sessionId = process.env.CROWCODER_SESSION_ID || 'unknown';
+    // Sanitize sessionId before joining into a path. Without this,
+    // a sessionId of e.g. "../../../.ssh/authorized_keys" would let
+    // `path.join` traverse out of the state dir, and the subsequent
+    // writeFileSync would overwrite arbitrary files with attacker-
+    // controllable JSON (the touched-set array, which can include
+    // model-controlled file paths). Allow only [A-Za-z0-9_-], length
+    // <=64. Anything else falls back to "unknown" — degraded UX
+    // (gateguard tracking won't persist), not a security breach.
+    const rawSessionId = process.env.COMPACT_AGENT_SESSION_ID || process.env.CROWCODER_SESSION_ID || '';
+    const sessionId = /^[A-Za-z0-9_-]{1,64}$/.test(rawSessionId) ? rawSessionId : 'unknown';
     const stateDir = pathMod.join(os.homedir(), '.compact-agent', 'state', 'gateguard');
     const stateFile = pathMod.join(stateDir, `${sessionId}.json`);
 
@@ -349,7 +389,11 @@ const checks = {
     const fs = require('fs');
     const pathMod = require('path');
     const os = require('os');
-    const sessionId = process.env.CROWCODER_SESSION_ID || 'unknown';
+    // Read both env-var names + sanitize, same pattern as gateguard.
+    // Previously only read the legacy CROWCODER_SESSION_ID, which broke
+    // for any wrapper that exported only the new COMPACT_AGENT_* names.
+    const rawSessionId = process.env.COMPACT_AGENT_SESSION_ID || process.env.CROWCODER_SESSION_ID || '';
+    const sessionId = /^[A-Za-z0-9_-]{1,64}$/.test(rawSessionId) ? rawSessionId : 'unknown';
     const stateDir = pathMod.join(os.homedir(), '.compact-agent', 'state', 'quality-hint');
     const stateFile = pathMod.join(stateDir, `${sessionId}.json`);
 

package/dist/export.js

@@ -101,7 +101,7 @@ function getExtension(format) {
 export function saveExport(messages, format) {
     const formatted = formatMessages(messages, format);
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-').slice(0, -5);
-    const filename = `crowcoder-export-${timestamp}.${getExtension(format)}`;
+    const filename = `compact-agent-export-${timestamp}.${getExtension(format)}`;
     const filepath = path.join(process.cwd(), filename);
     fs.writeFileSync(filepath, formatted, 'utf-8');
     return filepath;

package/dist/export.js.map

@@ -1 +1 @@
-{"version":3,"file":"export.js","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"export.js","sourceRoot":"","sources":["../src/export.ts"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -244,7 +244,7 @@ export function handleSlashCommand(input, config, messages, session, mode) {
             console.log(d('  ') + c('/history') + d('          — message count & token estimate'));
             console.log(d('  ') + c('/export [fmt]') + d('     — export conversation (md/json/txt)'));
             console.log(d('  ') + c('/exit') + d('             — quit (alias: /quit)'));
-            console.log(d('  ') + c('/walkthrough') + d('      — agent-led tour of Crowcoder (aliases: /tour, /guide)'));
+            console.log(d('  ') + c('/walkthrough') + d('      — agent-led tour of compact-agent (aliases: /tour, /guide)'));
             console.log(d('  ') + c('!<cmd>') + d('            — run shell command directly'));
             console.log(h('\n  ── Productivity hotkeys ──'));
             console.log(d('  ') + c('Shift+Tab') + d('         — cycle permission modes (ask → auto → yolo)'));
@@ -405,9 +405,19 @@ export function handleSlashCommand(input, config, messages, session, mode) {
             }
             return { handled: true };
         // ── Clear ─────────────────────────────────────────
-        case '/clear':
+        case '/clear': {
+            // Also reset the global state that's keyed to the conversation
+            // so Shift+F3 / Shift+F1 / F12 don't surface stale data from
+            // before the clear. The main REPL loop replaces `messages` via
+            // `newMessages`; we just nuke the side-channel globals.
+            const g = globalThis;
+            g.__crowcoderQueuedInput = '';
+            g.__voiceLastFullResponse = null;
+            g.__voiceLastChunk = null;
+            g.__lastToolCall = null;
             console.log(chalk.dim('  Conversation cleared.'));
             return { handled: true, newMessages: [] };
+        }
         // ── Backtrack — rewind to a prior user turn (Codex audit item 4) ──
         //   /back          list recent user messages with numbers
         //   /back <n>      truncate conversation to BEFORE the nth most-recent
@@ -466,14 +476,23 @@ export function handleSlashCommand(input, config, messages, session, mode) {
         case '/fork':
         case '/branch': {
             const forkName = args.trim() || `fork of ${session.name}`;
-            // Save the current session under its existing ID first so the
-            // pre-fork state is recoverable via /resume.
-            saveSession({ ...session, messages: [...messages] }).catch(() => { });
+            // Snapshot the pre-fork state in a SEPARATE object before
+            // mutating the live `session` reference — otherwise both save
+            // calls write to whichever ID the mutation has currently set,
+            // overwriting the original branch and silently breaking the
+            // "previous session reachable via /resume" promise. (Bug found
+            // by audit; previously the spread happened AFTER `session.id`
+            // was reassigned, so both saves landed under the new ID.)
             const previousId = session.id;
-            // Mutate the active session in place: new ID + name + timestamps,
-            // same messages. The REPL keeps running against `session` so
-            // mutation is enough — no need to plumb a "swap" through the
-            // return value.
+            const previousSnapshot = {
+                ...session,
+                id: previousId,
+                messages: [...messages],
+            };
+            saveSession(previousSnapshot).catch(() => { });
+            // Now mutate the active session in place. The REPL keeps
+            // running against `session` so mutation is enough — no need
+            // to plumb a swap through the return value.
             session.id = generateSessionId();
             session.name = forkName;
             session.createdAt = new Date().toISOString();
@@ -2100,11 +2119,22 @@ export function handleSlashCommand(input, config, messages, session, mode) {
         // user is testing the pipeline or running under a terminal that strips
         // function keys. Records up to 30s, transcribes, injects as next prompt.
         case '/dictate': {
-            const maxSec = parseInt(args, 10) || 30;
-            console.log(chalk.dim(`  /dictate — recording up to ${maxSec}s…`));
+            // Parse + clamp the duration argument.
+            //   /dictate          → 30s default
+            //   /dictate 60       → 60s, clamped to [1, 300]
+            //   /dictate 0        → 30s (user clearly wanted default or
+            //                       cancel; previously parseInt(0) || 30
+            //                       gave 30 silently)
+            //   /dictate -5       → 30s (negative is nonsense)
+            //   /dictate abc      → 30s default
+            const parsed = parseInt(args, 10);
+            const sec = Number.isFinite(parsed) && parsed > 0
+                ? Math.min(300, parsed)
+                : 30;
+            console.log(chalk.dim(`  /dictate — recording up to ${sec}s…`));
             // Return as an async-injected prompt; we resolve the recording
             // synchronously here for simplicity (REPL is blocking anyway).
-            return { handled: true, injectPrompt: '__DICTATE__' + maxSec };
+            return { handled: true, injectPrompt: '__DICTATE__' + sec };
         }
         // /accessibility — show or toggle the accessibility sub-block
         //   /accessibility                  — print status
@@ -2598,10 +2628,20 @@ async function main() {
             // memory of both Claude Code and Codex CLI ("Esc-Esc to step
             // back"). When the prompt buffer has content, single Esc clears
             // the typed buffer (readline default); Esc-Esc still rewinds
-            // only when buffer was empty going in. Mid-stream Esc is handled
-            // at the byte level in query.ts dataHandler instead — by the
-            // time keypress events fire, the input is already suppressed.
+            // only when buffer was empty going in.
             if (name === 'escape') {
+                // Mid-stream Esc is handled at the byte level in query.ts
+                // dataHandler (where it triggers the steer cancel). The
+                // hotkey-listener Esc branch must explicitly bail when a
+                // turn is in progress, otherwise the user sees BOTH the
+                // steer effect AND the "press Esc again to rewind" hint
+                // print, and a second Esc enqueues /back on top of the
+                // already-cancelled turn. Audit P0.
+                const turnCtl = globalThis.__turnAbortCtl;
+                if (turnCtl && !turnCtl.signal.aborted) {
+                    lastEscapeMs = 0;
+                    return;
+                }
                 const buf = rl.line ?? '';
                 if (buf.trim()) {
                     // Non-empty buffer: don't intercept, let readline do its
@@ -2614,15 +2654,29 @@ async function main() {
                     // Second Esc within window — fire /back.
                     lastEscapeMs = 0;
                     // Enqueue the slash command as queued input. The REPL loop
-                    // picks it up + executes /back the same way as if typed.
+                    // picks it up + dispatches /back on the next iteration.
                     globalThis.__crowcoderQueuedInput = '/back\n';
                     announce('Esc-Esc', 'Rewinding to previous user turn.');
-                    // Nudge readline by writing an empty line so the question
-                    // resolves and the main loop's queued-input drain fires.
+                    // Resolve the pending rl.question() so the main loop
+                    // actually moves on. Previously this used stdin.write('\n')
+                    // which DOESN'T interrupt readline — it merely adds a
+                    // newline to the input stream that readline reads as if
+                    // the user typed it, leaving the REPL stuck until the user
+                    // pressed Enter manually. emit('line', '') triggers the
+                    // 'line' event that rl.question internally listens for,
+                    // resolving the promise immediately. (Bug found by audit.)
                     try {
-                        stdin.write('\n');
+                        rl.emit('line', '');
+                    }
+                    catch {
+                        // Fallback path if rl.emit isn't accepted for some reason
+                        // (e.g. on a future readline version): still nudge via
+                        // stdin so the user can recover by pressing any key.
+                        try {
+                            stdin.write('\n');
+                        }
+                        catch { /* noop */ }
                     }
-                    catch { /* noop */ }
                     return;
                 }
                 lastEscapeMs = now;