gsd-remix 1.0.0

package/sdk/src/query/commit.ts

@@ -0,0 +1,301 @@
+/**
+ * Git commit and check-commit query handlers.
+ *
+ * Ported from get-shit-done/bin/lib/commands.cjs (cmdCommit, cmdCheckCommit)
+ * and core.cjs (execGit). Provides commit creation with message sanitization
+ * and pre-commit validation.
+ *
+ * @example
+ * ```typescript
+ * import { commit, checkCommit } from './commit.js';
+ *
+ * await commit(['docs: update state', '.planning/STATE.md'], '/project');
+ * // { data: { committed: true, hash: 'abc1234', message: 'docs: update state', files: [...] } }
+ *
+ * await checkCommit([], '/project');
+ * // { data: { can_commit: true, reason: 'commit_docs_enabled', ... } }
+ * ```
+ */
+
+import { readFile } from 'node:fs/promises';
+import { spawnSync } from 'node:child_process';
+import { GSDError } from '../errors.js';
+import { planningPaths, resolvePathUnderProject } from './helpers.js';
+import type { QueryHandler } from './utils.js';
+
+// ─── execGit ──────────────────────────────────────────────────────────────
+
+/**
+ * Run a git command in the given working directory.
+ *
+ * Ported from core.cjs lines 531-542.
+ *
+ * @param cwd - Working directory for the git command
+ * @param args - Git command arguments (e.g., ['commit', '-m', 'msg'])
+ * @returns Object with exitCode, stdout, and stderr
+ */
+export function execGit(cwd: string, args: string[]): { exitCode: number; stdout: string; stderr: string } {
+  const result = spawnSync('git', args, {
+    cwd,
+    stdio: 'pipe',
+    encoding: 'utf-8',
+  });
+  return {
+    exitCode: result.status ?? 1,
+    stdout: (result.stdout ?? '').toString().trim(),
+    stderr: (result.stderr ?? '').toString().trim(),
+  };
+}
+
+// ─── sanitizeCommitMessage ────────────────────────────────────────────────
+
+/**
+ * Sanitize a commit message to prevent prompt injection.
+ *
+ * Ported from security.cjs sanitizeForPrompt.
+ * Strips zero-width characters, null bytes, and neutralizes
+ * known injection markers that could hijack agent context.
+ *
+ * @param text - Raw commit message
+ * @returns Sanitized message safe for git commit
+ */
+export function sanitizeCommitMessage(text: string): string {
+  if (!text || typeof text !== 'string') return '';
+
+  let sanitized = text;
+
+  // Strip null bytes
+  sanitized = sanitized.replace(/\0/g, '');
+
+  // Strip zero-width characters that could hide instructions
+  sanitized = sanitized.replace(/[\u200B-\u200F\u2028-\u202F\uFEFF\u00AD]/g, '');
+
+  // Neutralize XML/HTML tags that mimic system boundaries
+  sanitized = sanitized.replace(/<(\/?)?(?:system|assistant|human)>/gi,
+    (_match, slash) => `\uFF1C${slash || ''}system-text\uFF1E`);
+
+  // Neutralize [SYSTEM] / [INST] markers
+  sanitized = sanitized.replace(/\[(SYSTEM|INST)\]/gi, '[$1-TEXT]');
+
+  // Neutralize <<SYS>> markers
+  sanitized = sanitized.replace(/<<\s*SYS\s*>>/gi, '\u00ABSYS-TEXT\u00BB');
+
+  return sanitized;
+}
+
+// ─── commit ───────────────────────────────────────────────────────────────
+
+/**
+ * Stage files and create a git commit.
+ *
+ * Checks commit_docs config (unless --force), sanitizes message,
+ * stages specified files (or all .planning/), and commits.
+ *
+ * @param args - args[0]=message, remaining=file paths or flags (--force, --amend, --no-verify)
+ * @param projectDir - Project root directory
+ * @returns QueryResult with commit result
+ */
+export const commit: QueryHandler = async (args, projectDir) => {
+  const allArgs = [...args];
+
+  // Extract flags
+  const hasForce = allArgs.includes('--force');
+  const hasAmend = allArgs.includes('--amend');
+  const hasNoVerify = allArgs.includes('--no-verify');
+  const filesIndex = allArgs.indexOf('--files');
+  const endIndex = filesIndex !== -1 ? filesIndex : allArgs.length;
+  // CodeRabbit #6: don't strip arbitrary `--foo` tokens from commit messages
+  const knownFlags = new Set(['--force', '--amend', '--no-verify']);
+  const messageArgs = allArgs.slice(0, endIndex).filter(a => !knownFlags.has(a));
+  const message = messageArgs.join(' ') || undefined;
+  const filePaths =
+    filesIndex !== -1 ? allArgs.slice(filesIndex + 1).filter(a => !a.startsWith('--')) : [];
+
+  if (!message && !hasAmend) {
+    return { data: { committed: false, reason: 'commit message required' } };
+  }
+
+  // Check commit_docs config unless --force
+  if (!hasForce) {
+    const paths = planningPaths(projectDir);
+    try {
+      const raw = await readFile(paths.config, 'utf-8');
+      const config = JSON.parse(raw) as Record<string, unknown>;
+      if (config.commit_docs === false) {
+        return { data: { committed: false, reason: 'commit_docs disabled' } };
+      }
+    } catch {
+      // No config or malformed — allow commit
+    }
+  }
+
+  // Sanitize message
+  const sanitized = message ? sanitizeCommitMessage(message) : message;
+
+  // Stage files
+  const filesToStage = filePaths.length > 0 ? filePaths : ['.planning/'];
+  for (const file of filesToStage) {
+    const addResult = execGit(projectDir, ['add', file]);
+    if (addResult.exitCode !== 0) {
+      return { data: { committed: false, reason: addResult.stderr || `failed to stage ${file}`, exitCode: addResult.exitCode } };
+    }
+  }
+
+  // Check if anything is staged
+  const diffResult = execGit(projectDir, ['diff', '--cached', '--name-only']);
+  const stagedFiles = diffResult.stdout ? diffResult.stdout.split('\n').filter(Boolean) : [];
+  if (stagedFiles.length === 0) {
+    return { data: { committed: false, reason: 'nothing staged' } };
+  }
+
+  // Build commit command
+  const commitArgs: string[] = hasAmend
+    ? ['commit', '--amend', '--no-edit']
+    : ['commit', '-m', sanitized ?? ''];
+  if (hasNoVerify) commitArgs.push('--no-verify');
+
+  const commitResult = execGit(projectDir, commitArgs);
+  if (commitResult.exitCode !== 0) {
+    if (commitResult.stdout.includes('nothing to commit') || commitResult.stderr.includes('nothing to commit')) {
+      return { data: { committed: false, reason: 'nothing to commit' } };
+    }
+    return { data: { committed: false, reason: commitResult.stderr || 'commit failed', exitCode: commitResult.exitCode } };
+  }
+
+  // Get short hash
+  const hashResult = execGit(projectDir, ['rev-parse', '--short', 'HEAD']);
+  const hash = hashResult.exitCode === 0 ? hashResult.stdout : null;
+
+  return { data: { committed: true, hash, message: sanitized, files: stagedFiles } };
+};
+
+// ─── checkCommit ──────────────────────────────────────────────────────────
+
+/**
+ * Validate whether a commit can proceed.
+ *
+ * Checks commit_docs config and staged file state.
+ *
+ * @param _args - Unused
+ * @param projectDir - Project root directory
+ * @returns QueryResult with { can_commit, reason, commit_docs, staged_files }
+ */
+export const checkCommit: QueryHandler = async (_args, projectDir) => {
+  const paths = planningPaths(projectDir);
+
+  let commitDocs = true;
+  try {
+    const raw = await readFile(paths.config, 'utf-8');
+    const config = JSON.parse(raw) as Record<string, unknown>;
+    if (config.commit_docs === false) {
+      commitDocs = false;
+    }
+  } catch {
+    // No config — default to allowing commits
+  }
+
+  // Check staged files
+  const diffResult = execGit(projectDir, ['diff', '--cached', '--name-only']);
+  const stagedFiles = diffResult.stdout ? diffResult.stdout.split('\n').filter(Boolean) : [];
+
+  if (!commitDocs) {
+    // If commit_docs is false, check if any .planning/ files are staged
+    const planningFiles = stagedFiles.filter(f => f.startsWith('.planning/') || f.startsWith('.planning\\'));
+    if (planningFiles.length > 0) {
+      return {
+        data: {
+          allowed: false,
+          can_commit: false,
+          reason: `commit_docs is false but ${planningFiles.length} .planning/ file(s) are staged`,
+          commit_docs: false,
+          staged_files: planningFiles,
+        },
+      };
+    }
+  }
+
+  return {
+    data: {
+      allowed: true,
+      can_commit: true,
+      reason: commitDocs ? 'commit_docs_enabled' : 'no_planning_files_staged',
+      commit_docs: commitDocs,
+      staged_files: stagedFiles,
+    },
+  };
+};
+
+// ─── commitToSubrepo ─────────────────────────────────────────────────────
+
+export const commitToSubrepo: QueryHandler = async (args, projectDir) => {
+  const filesIdx = args.indexOf('--files');
+  const endIdx = filesIdx >= 0 ? filesIdx : args.length;
+  const knownFlags = new Set(['--force', '--amend', '--no-verify']);
+  const messageArgs = args.slice(0, endIdx).filter(a => !knownFlags.has(a));
+  const message = messageArgs.join(' ') || undefined;
+  const files = filesIdx >= 0 ? args.slice(filesIdx + 1).filter(a => !a.startsWith('--')) : [];
+
+  if (!message) {
+    return { data: { committed: false, reason: 'commit message required' } };
+  }
+
+  const paths = planningPaths(projectDir);
+  let config: Record<string, unknown> = {};
+  try {
+    const raw = await readFile(paths.config, 'utf-8');
+    config = JSON.parse(raw) as Record<string, unknown>;
+  } catch {
+    /* no config */
+  }
+  const subRepos = config.sub_repos as string[] | undefined;
+  if (!subRepos || subRepos.length === 0) {
+    return {
+      data: { committed: false, reason: 'no sub_repos configured in .planning/config.json' },
+    };
+  }
+
+  if (files.length === 0) {
+    return { data: { committed: false, reason: '--files required for commit-to-subrepo' } };
+  }
+
+  const sanitized = sanitizeCommitMessage(message);
+  if (!sanitized && message) {
+    return { data: { committed: false, reason: 'commit message empty after sanitization' } };
+  }
+
+  try {
+    for (const file of files) {
+      try {
+        await resolvePathUnderProject(projectDir, file);
+      } catch (err) {
+        if (err instanceof GSDError) {
+          return { data: { committed: false, reason: `${err.message}: ${file}` } };
+        }
+        throw err;
+      }
+    }
+
+    const fileArgs = files.length > 0 ? files : ['.'];
+    const addResult = spawnSync('git', ['-C', projectDir, 'add', ...fileArgs], { stdio: 'pipe', encoding: 'utf-8' });
+    if (addResult.status !== 0) {
+      return { data: { committed: false, reason: addResult.stderr || 'git add failed' } };
+    }
+
+    const commitResult = spawnSync(
+      'git', ['-C', projectDir, 'commit', '-m', sanitized],
+      { stdio: 'pipe', encoding: 'utf-8' },
+    );
+    if (commitResult.status !== 0) {
+      return { data: { committed: false, reason: commitResult.stderr || 'commit failed' } };
+    }
+
+    const hashResult = spawnSync(
+      'git', ['-C', projectDir, 'rev-parse', '--short', 'HEAD'],
+      { encoding: 'utf-8' },
+    );
+    const hash = hashResult.stdout.trim();
+    return { data: { committed: true, hash, message: sanitized } };
+  } catch (err) {
+    return { data: { committed: false, reason: String(err) } };
+  }
+};

package/sdk/src/query/config-gates.test.ts

@@ -0,0 +1,89 @@
+import { mkdtemp, mkdir, writeFile } from 'node:fs/promises';
+import { rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { describe, it, expect } from 'vitest';
+import { checkConfigGates } from './config-gates.js';
+
+function cleanupTempDir(dir: string): void {
+  try {
+    rmSync(dir, { recursive: true, force: true });
+  } catch {
+    /* ignore */
+  }
+}
+
+describe('checkConfigGates', () => {
+  it('returns merged workflow defaults when config is absent', async () => {
+    const dir = await mkdtemp(join(tmpdir(), 'gsd-cg-'));
+    try {
+      await mkdir(join(dir, '.planning'), { recursive: true });
+      const { data } = await checkConfigGates([], dir);
+      expect(data).toMatchObject({
+        workflow: null,
+        research_enabled: true,
+        plan_checker_enabled: true,
+        nyquist_validation: true,
+        ui_phase: true,
+        auto_advance: false,
+        auto_chain_active: false,
+        code_review: true,
+        context_window: 200000,
+      });
+    } finally {
+      cleanupTempDir(dir);
+    }
+  });
+
+  it('treats string "false" as false and honors plan_checker alias', async () => {
+    const dir = await mkdtemp(join(tmpdir(), 'gsd-cg-'));
+    try {
+      await mkdir(join(dir, '.planning'), { recursive: true });
+      await writeFile(
+        join(dir, '.planning', 'config.json'),
+        JSON.stringify({
+          workflow: {
+            nyquist_validation: 'false',
+            plan_checker: false,
+          },
+        }),
+        'utf-8',
+      );
+      const { data } = await checkConfigGates([], dir);
+      expect(data.nyquist_validation).toBe(false);
+      expect(data.plan_checker_enabled).toBe(false);
+      expect(data.plan_check).toBe(false);
+    } finally {
+      cleanupTempDir(dir);
+    }
+  });
+
+  it('reflects workflow overrides from config.json', async () => {
+    const dir = await mkdtemp(join(tmpdir(), 'gsd-cg-'));
+    try {
+      await mkdir(join(dir, '.planning'), { recursive: true });
+      await writeFile(
+        join(dir, '.planning', 'config.json'),
+        JSON.stringify({
+          workflow: {
+            research: false,
+            auto_advance: true,
+            _auto_chain_active: true,
+          },
+          context_window: 100000,
+        }),
+        'utf-8',
+      );
+      const { data } = await checkConfigGates(['plan-phase'], dir);
+      expect(data).toMatchObject({
+        workflow: 'plan-phase',
+        research_enabled: false,
+        auto_advance: true,
+        auto_chain_active: true,
+        context_window: 100000,
+      });
+    } finally {
+      cleanupTempDir(dir);
+    }
+  });
+});

package/sdk/src/query/config-gates.ts

@@ -0,0 +1,69 @@
+/**
+ * Batch workflow config for orchestration decisions (`check.config-gates`).
+ *
+ * Replaces many repeated `config-get workflow.*` calls with one JSON object.
+ * See `.planning/research/decision-routing-audit.md` §3.3.
+ */
+
+import { CONFIG_DEFAULTS, loadConfig } from '../config.js';
+import type { QueryHandler } from './utils.js';
+
+/** Treat stringly YAML booleans safely (`Boolean('false')` is true — avoid that). */
+function workflowBool(v: unknown, defaultVal: boolean): boolean {
+  if (v === undefined || v === null) return defaultVal;
+  if (typeof v === 'boolean') return v;
+  if (typeof v === 'string') {
+    const s = v.toLowerCase().trim();
+    if (s === 'false' || s === '0' || s === 'no' || s === 'off') return false;
+    if (s === 'true' || s === '1' || s === 'yes' || s === 'on') return true;
+  }
+  return Boolean(v);
+}
+
+/**
+ * Merge workflow defaults with project config, then expose stable keys for workflows.
+ */
+export const checkConfigGates: QueryHandler = async (args, projectDir) => {
+  const config = await loadConfig(projectDir);
+  const wf: Record<string, unknown> = {
+    ...CONFIG_DEFAULTS.workflow,
+    ...(config.workflow as unknown as Record<string, unknown>),
+  };
+  const root = config as Record<string, unknown>;
+  const contextWindow =
+    typeof root.context_window === 'number' ? root.context_window : 200000;
+
+  /** Prefer explicit `plan_checker` when present (alias); else `plan_check` (defaults include only the latter). */
+  const w = wf as Record<string, unknown>;
+  const planCheckFlag = w.plan_checker !== undefined ? w.plan_checker : w.plan_check;
+
+  const data: Record<string, unknown> = {
+    workflow: args[0] ?? null,
+    research_enabled: workflowBool(wf.research, true),
+    plan_checker_enabled: workflowBool(planCheckFlag, true),
+    nyquist_validation: workflowBool(wf.nyquist_validation, true),
+    security_enforcement: workflowBool(wf.security_enforcement, true),
+    security_asvs_level: wf.security_asvs_level ?? 1,
+    security_block_on: wf.security_block_on ?? 'high',
+    ui_phase: workflowBool(wf.ui_phase, true),
+    ui_safety_gate: workflowBool(wf.ui_safety_gate, true),
+    ui_review: workflowBool(wf.ui_review, true),
+    text_mode: workflowBool(wf.text_mode, false),
+    auto_advance: workflowBool(wf.auto_advance, false),
+    auto_chain_active: workflowBool(wf._auto_chain_active, false),
+    code_review: workflowBool(wf.code_review, true),
+    code_review_depth: wf.code_review_depth ?? 'standard',
+    context_window: contextWindow,
+    discuss_mode: String(wf.discuss_mode ?? 'discuss'),
+    use_worktrees: workflowBool(wf.use_worktrees, true),
+    skip_discuss: workflowBool(wf.skip_discuss, false),
+    max_discuss_passes: wf.max_discuss_passes ?? 3,
+    node_repair: workflowBool(wf.node_repair, true),
+    research_before_questions: workflowBool(wf.research_before_questions, false),
+    verifier: workflowBool(wf.verifier, true),
+    plan_check: workflowBool(planCheckFlag, true),
+    subagent_timeout: wf.subagent_timeout ?? CONFIG_DEFAULTS.workflow.subagent_timeout,
+  };
+
+  return { data };
+};