@opengsd/gsd-core 1.7.0-rc.5 → 1.7.0

package/gsd-core/bin/lib/capability-validator.cjs

@@ -697,26 +697,35 @@ const VALID_CONVERTER_NAMES = new Set([
   'convertClaudeAgentToCodebuddyAgent',
   'convertClaudeAgentToClineAgent',
   'convertClaudeAgentToCodexAgent',
+  // ADR-1239 / #2092 Phase B Upgrade 1 — native .qwen/agents/*.md subagent projection.
+  'convertClaudeAgentToQwenAgent',
 ]);
 
 // C3: Validate role:runtime body
 const VALID_CONFIG_FORMATS = new Set(['settings-json', 'toml', 'markdown', 'markdown-dir', 'none']);
-const VALID_CONFIG_HOME_KINDS = new Set(['dot-home', 'dot-home-nested', 'xdg', 'generic-agents-root']);
+// 'none' added #2103 — Marketplace/VSIX-distributed hosts (e.g. VS Code) with
+// no file-projected config directory at all.
+const VALID_CONFIG_HOME_KINDS = new Set(['dot-home', 'dot-home-nested', 'xdg', 'generic-agents-root', 'none']);
 const VALID_COMMAND_STYLES = new Set(['slash-hyphen', 'shell-var']);
-const VALID_HOOKS_SURFACES = new Set(['settings-json', 'codex-hooks-json', 'cursor-hooks-json', 'copilot-inline', 'cline-rules', 'none']);
+const VALID_HOOKS_SURFACES = new Set(['settings-json', 'codex-hooks-json', 'cursor-hooks-json', 'copilot-inline', 'cline-rules', 'kimi-hooks-toml', 'windsurf-hooks-json', 'none']);
 const VALID_HOOK_EVENTS = new Set(['claude', 'gemini']);
 // extensionEvents — the plugin/extension-system event dialect (ADR-1239 amendment / #1943).
 // DISTINCT from hookEvents (managed-hook dialect): extensionEvents describes the
 // plugin-owned event subset imperative hosts expose (opencode / pi); 'none' = the
 // host exposes no extension surface (engine owns the bus, e.g. VS Code).
-const VALID_EXTENSION_EVENTS = new Set(['opencode', 'pi', 'hermes', 'none']);
+const VALID_EXTENSION_EVENTS = new Set(['opencode', 'pi', 'hermes', 'kilo', 'none']);
 const VALID_SANDBOX_TIERS = new Set(['none', 'codex-agent-sandbox']);
 const VALID_ARTIFACT_KIND_NAMES = new Set(['commands', 'agents', 'skills', 'kimi-agents']);
 const VALID_ARTIFACT_NESTINGS = new Set(['flat', 'nested']);
 const FEATURE_FIELDS_FORBIDDEN_ON_RUNTIME = ['skills', 'agents', 'steps', 'contributions', 'gates', 'hooks', 'activationKey'];
-const VALID_INSTALL_SURFACES = new Set(['settings-json', 'codex-toml', 'copilot-instructions', 'cline-rules', 'cursor-hooks-json', 'profile-marker-only']);
-const VALID_PERMISSION_WRITERS = new Set(['opencode', 'kilo']);
-const VALID_EXTENDED_HOOK_EVENTS = new Set(['SubagentStop', 'Stop', 'PreCompact', 'FileChanged', 'BeforeAgent', 'AfterAgent', 'BeforeModel']);
+// 'none' added #2103 — Marketplace/VSIX-distributed hosts (e.g. VS Code) that
+// are never CLI-installed (no allRuntimes membership, no install flag).
+const VALID_INSTALL_SURFACES = new Set(['settings-json', 'codex-toml', 'copilot-instructions', 'cline-rules', 'cursor-hooks-json', 'profile-marker-only', 'none']);
+// 'antigravity' added #2096 Phase B Upgrade 1 — settings.json permissions.allow writer.
+const VALID_PERMISSION_WRITERS = new Set(['opencode', 'kilo', 'antigravity']);
+// SubagentStart added #2092 Phase B Upgrade 2 (qwen-only today — see
+// capabilities/qwen/capability.json's extendedHookEvents).
+const VALID_EXTENDED_HOOK_EVENTS = new Set(['SubagentStop', 'Stop', 'PreCompact', 'FileChanged', 'BeforeAgent', 'AfterAgent', 'BeforeModel', 'SubagentStart']);
 
 // ADR-1239 Phase A: hostIntegration axes (MUST stay parity-identical to HOST_INTEGRATION_AXES in src/host-integration.cts)
 const VALID_EMBEDDING_MODES   = new Set(['imperative', 'declarative']);
@@ -736,13 +745,18 @@ const INSTALL_SURFACE_TO_ALLOWED_HOOKS_SURFACES = new Map([
   ['copilot-instructions', new Set(['copilot-inline'])],
   ['cline-rules',          new Set(['cline-rules'])],
   ['cursor-hooks-json',    new Set(['cursor-hooks-json'])],
-  ['profile-marker-only',  new Set(['none'])],
+  ['profile-marker-only',  new Set(['none', 'kimi-hooks-toml', 'windsurf-hooks-json'])],
+  // 'none' added #2103 — VS Code has no CLI install surface at all; its only
+  // valid hooksSurface pairing is the other 'none' (engine owns the hook bus).
+  ['none',                 new Set(['none'])],
 ]);
 
 // GATE B: extended hook event families → required hookEvents value
 // Gemini agent-events require hookEvents='gemini'; Claude-family events require hookEvents='claude'.
 const GEMINI_AGENT_EVENTS = new Set(['BeforeAgent', 'AfterAgent', 'BeforeModel']);
-const CLAUDE_FAMILY_EVENTS = new Set(['SubagentStop', 'Stop', 'PreCompact', 'FileChanged']);
+// SubagentStart added #2092 Phase B Upgrade 2 — Claude hook-event dialect
+// counterpart of SubagentStop (qwen-only today).
+const CLAUDE_FAMILY_EVENTS = new Set(['SubagentStop', 'Stop', 'PreCompact', 'FileChanged', 'SubagentStart']);
 
 /**
  * Validate a runtime.configHome object per ADR-1016 Decision 1.
@@ -771,9 +785,18 @@ function validateConfigHome(capId, ch) {
     );
   }
 
-  // name — required string
-  if (typeof ch.name !== 'string' || ch.name.length === 0) {
-    errors.push(ctx + '.name must be a non-empty string');
+  // name — required string, except when kind === 'none': the runtime has no
+  // file-projected config directory at all, so a descriptive name is
+  // optional (a carve-out mirroring the dot-home-nested⇒parent conditional
+  // below, not a new validation mechanism). If present it must still be a
+  // non-empty string (e.g. vscode's configHome.name stays a descriptive
+  // "vscode" string even though it is never used to build a path).
+  if (ch.kind !== 'none') {
+    if (typeof ch.name !== 'string' || ch.name.length === 0) {
+      errors.push(ctx + '.name must be a non-empty string');
+    }
+  } else if (ch.name !== undefined && (typeof ch.name !== 'string' || ch.name.length === 0)) {
+    errors.push(ctx + '.name must be a non-empty string if present when kind is "none"');
   }
 
   // parent — required when kind == dot-home-nested
@@ -973,7 +996,7 @@ function validateRuntimeBody(cap) {
     );
   }
 
-  // hooksSurface — closed 6-enum (ADR-1016 Decision 5); inline literal guard (CodeQL barrier)
+  // hooksSurface — closed 7-enum (ADR-1016 Decision 5); inline literal guard (CodeQL barrier)
   if (r.hooksSurface === '__proto__' || r.hooksSurface === 'constructor' || r.hooksSurface === 'prototype') {
     errors.push('runtime.hooksSurface "' + r.hooksSurface + '" is a reserved name');
   } else if (!VALID_HOOKS_SURFACES.has(r.hooksSurface)) {
@@ -1054,15 +1077,27 @@ function validateRuntimeBody(cap) {
   // localConfigDir — REQUIRED non-empty dot-dir string (ADR-1239 Phase B #1679)
   // Must start with '.' (e.g. ".claude", ".cursor"). Validated here so the registry
   // generator catches any descriptor missing the field before regenerating.
-  if (typeof r.localConfigDir !== 'string' || r.localConfigDir.length === 0) {
+  //
+  // #2103: conditional on configHome.kind !== 'none' — a Marketplace/VSIX
+  // host with no file-projected config directory (e.g. VS Code) has no
+  // local dir to name; localConfigDir may be null/absent for such runtimes.
+  const configHomeKind = (r.configHome && typeof r.configHome === 'object') ? r.configHome.kind : undefined;
+  if (configHomeKind !== 'none') {
+    if (typeof r.localConfigDir !== 'string' || r.localConfigDir.length === 0) {
+      errors.push(
+        'runtime.localConfigDir is required and must be a non-empty string (e.g. ".claude"); ' +
+        'got: ' + JSON.stringify(r.localConfigDir),
+      );
+    } else if (!r.localConfigDir.startsWith('.')) {
+      errors.push(
+        'runtime.localConfigDir must start with "." (a dot-dir); got: ' + JSON.stringify(r.localConfigDir),
+      );
+    }
+  } else if (r.localConfigDir !== null && r.localConfigDir !== undefined) {
     errors.push(
-      'runtime.localConfigDir is required and must be a non-empty string (e.g. ".claude"); ' +
+      'runtime.localConfigDir must be null or absent when configHome.kind is "none"; ' +
       'got: ' + JSON.stringify(r.localConfigDir),
     );
-  } else if (!r.localConfigDir.startsWith('.')) {
-    errors.push(
-      'runtime.localConfigDir must start with "." (a dot-dir); got: ' + JSON.stringify(r.localConfigDir),
-    );
   }
 
   // extendedHookEvents — required array; every element must be in closed enum
@@ -2168,6 +2203,9 @@ const INSTALL_SURFACE_TO_CONFIG_FORMAT = new Map([
   ['cline-rules',          'markdown-dir'],
   ['cursor-hooks-json',    'none'],
   ['profile-marker-only',  'none'],
+  // 'none' added #2103 — a runtime with NO CLI install surface at all (e.g.
+  // VS Code) has no config-file format to write either.
+  ['none',                 'none'],
 ]);
 
 /**

package/gsd-core/bin/lib/check-command-router.cjs

@@ -919,7 +919,7 @@ function cmdApiCoverageVerifyPre(projectDir, args, raw) {
     // .planning/phases/ (or a milestone archive). The raw arg is never used as a
     // path, so `..`, absolute paths, and arbitrary directories cannot reach a
     // file read. Mirrors cmdVerifySchemaDrift's token-match approach.
-    let token = phaseArg.replace(/\\/g, '/').split('/').filter(Boolean).pop() || '';
+    let token = (0, shell_command_projection_cjs_1.posixNormalize)(phaseArg).split('/').filter(Boolean).pop() || '';
     // A token like ".." or "." carries no phase identity → unresolvable.
     if (token === '.' || token === '..')
         token = '';

package/gsd-core/bin/lib/clock.cjs

@@ -81,6 +81,25 @@ exports.realClock = {
     today() {
         return this.nowIso().split('T')[0];
     },
+    /**
+     * Return today's date as a YYYY-MM-DD string in the HOST-LOCAL calendar day.
+     * Uses this.now() so the subprocess time-pin adapter (GSD_NOW_MS) is honoured
+     * exactly as today()/nowIso() are — deterministic when GSD_NOW_MS and TZ are
+     * both pinned (#2136).
+     *
+     * Operator-facing date-only fields (last_activity, "completed <date>", etc.)
+     * must use the local calendar day: an operator reads them as "the day I did
+     * this", and they must never name a day ahead of `last_updated`'s local date.
+     * `today()` (UTC) stays the source for internal/cosmetic stamps.
+     *
+     * @returns e.g. "2020-06-14" (local), which may differ from today() near UTC midnight
+     */
+    localToday() {
+        const d = new Date(this.now());
+        const mm = String(d.getMonth() + 1).padStart(2, '0');
+        const dd = String(d.getDate()).padStart(2, '0');
+        return d.getFullYear() + '-' + mm + '-' + dd;
+    },
     /**
      * Synchronous sleep via Atomics.wait.
      * This is the identical primitive acquireStateLock and withPlanningLock used

package/gsd-core/bin/lib/commands.cjs

@@ -45,6 +45,7 @@ const { extractFrontmatter } = frontmatter;
 const modelProfiles = require("./model-profiles.cjs");
 const { MODEL_PROFILES, VALID_PHASE_TYPES } = modelProfiles;
 const runtime_slash_cjs_1 = require("./runtime-slash.cjs");
+const clock_cjs_1 = require("./clock.cjs");
 // ─── Phase Status ─────────────────────────────────────────────────────────────
 /**
  * Determine phase status by checking plan/summary counts AND verification state.
@@ -592,6 +593,7 @@ function cmdCommit(cwd, message, files, raw, amend, noVerify) {
     // Stage files
     const explicitFiles = files && files.length > 0;
     const filesToStage = explicitFiles ? files : ['.planning/'];
+    const stagedPaths = [];
     for (const file of filesToStage) {
         const fullPath = node_path_1.default.join(cwd, file);
         if (!node_fs_1.default.existsSync(fullPath)) {
@@ -607,12 +609,32 @@ function cmdCommit(cwd, message, files, raw, amend, noVerify) {
         }
         else {
             (0, shell_command_projection_cjs_1.execGit)(['add', file], { cwd });
+            stagedPaths.push(file);
         }
     }
-    // Commit (--no-verify skips pre-commit hooks, used by parallel executor agents)
-    const commitArgs = amend ? ['commit', '--amend', '--no-edit'] : ['commit', '-m', sanitizedMessage];
+    // Commit — when the caller declared a scope (--files), append a pathspec so
+    // only the declared files land in the commit, not the entire index (#2112).
+    // The pathspec uses stagedPaths (not filesToStage) so skipped missing files
+    // are excluded — otherwise git would record them as deletions (#2014).
+    // During a merge, git refuses partial commits — fall back to a bare commit.
+    // --amend is left without a pathspec: amending with -- <paths> is a different
+    // operation that rewrites the tip with only those paths.
+    if (explicitFiles && stagedPaths.length === 0 && !amend) {
+        const result = { committed: false, hash: null, reason: 'nothing_to_commit' };
+        output(result, raw, 'nothing');
+        return;
+    }
+    const isMergeInProgress = (0, shell_command_projection_cjs_1.execGit)(['rev-parse', '-q', '--verify', 'MERGE_HEAD'], { cwd }).exitCode === 0;
+    const canScope = explicitFiles && stagedPaths.length > 0 && !amend
+        && !isMergeInProgress;
+    const commitArgs = amend
+        ? ['commit', '--amend', '--no-edit']
+        : ['commit', '-m', sanitizedMessage];
     if (noVerify)
         commitArgs.push('--no-verify');
+    if (canScope) {
+        commitArgs.push('--', ...stagedPaths);
+    }
     const commitResult = (0, shell_command_projection_cjs_1.execGit)(commitArgs, { cwd });
     if (commitResult.exitCode !== 0) {
         if (commitResult.stdout.includes('nothing to commit') || commitResult.stderr.includes('nothing to commit')) {
@@ -710,12 +732,21 @@ function cmdCommitToSubrepo(cwd, message, files, raw) {
     for (const [repo, repoFiles] of Object.entries(grouped)) {
         const repoCwd = node_path_1.default.join(cwd, repo);
         // Stage files (strip sub-repo prefix for paths relative to that repo)
+        const stagedRelPaths = [];
         for (const file of repoFiles) {
             const relativePath = file.slice(repo.length + 1);
-            (0, shell_command_projection_cjs_1.execGit)(['add', relativePath], { cwd: repoCwd });
+            const addResult = (0, shell_command_projection_cjs_1.execGit)(['add', relativePath], { cwd: repoCwd });
+            if (addResult.exitCode === 0) {
+                stagedRelPaths.push(relativePath);
+            }
         }
-        // Commit
-        const commitResult = (0, shell_command_projection_cjs_1.execGit)(['commit', '-m', message], { cwd: repoCwd });
+        // Commit — pathspec limits the commit to the staged files only (#2112)
+        const isMergeInProgressSub = (0, shell_command_projection_cjs_1.execGit)(['rev-parse', '-q', '--verify', 'MERGE_HEAD'], { cwd: repoCwd }).exitCode === 0;
+        const canScopeSub = stagedRelPaths.length > 0 && !isMergeInProgressSub;
+        const commitArgs = canScopeSub
+            ? ['commit', '-m', message, '--', ...stagedRelPaths]
+            : ['commit', '-m', message];
+        const commitResult = (0, shell_command_projection_cjs_1.execGit)(commitArgs, { cwd: repoCwd });
         if (commitResult.exitCode !== 0) {
             if (commitResult.stdout.includes('nothing to commit') || commitResult.stderr.includes('nothing to commit')) {
                 repos[repo] = { committed: false, hash: null, files: repoFiles, reason: 'nothing_to_commit' };
@@ -837,8 +868,16 @@ function cmdPrSubrepo(cwd, repo, branch, commitMessage, raw) {
             error(`Failed to stage ${file} in ${repo}: ${addResult.stderr}`);
         }
     }
-    // 5. Commit
-    const commitResult = (0, shell_command_projection_cjs_1.execGit)(['commit', '-m', commitMessage], { cwd: repoCwd });
+    // 5. Commit — pathspec limits the commit to the staged files only (#2112).
+    // changedFiles includes both old and new paths for renames so the full
+    // rename is captured atomically (pathspec on newPath alone would leave the
+    // deletion of oldPath stranded in the index).
+    const isMergeInProgressPr = (0, shell_command_projection_cjs_1.execGit)(['rev-parse', '-q', '--verify', 'MERGE_HEAD'], { cwd: repoCwd }).exitCode === 0;
+    const canScopePr = changedFiles.length > 0 && !isMergeInProgressPr;
+    const commitArgs = canScopePr
+        ? ['commit', '-m', commitMessage, '--', ...changedFiles]
+        : ['commit', '-m', commitMessage];
+    const commitResult = (0, shell_command_projection_cjs_1.execGit)(commitArgs, { cwd: repoCwd });
     if (commitResult.exitCode !== 0) {
         rollback();
         error(`Failed to commit in ${repo}: ${commitResult.stderr}`);
@@ -1223,7 +1262,7 @@ function cmdTodoComplete(cwd, filename, raw) {
     (0, shell_command_projection_cjs_1.platformEnsureDir)(completedDir);
     // Read, add completion timestamp, move
     let content = node_fs_1.default.readFileSync(sourcePath, 'utf-8');
-    const today = new Date().toISOString().split('T')[0];
+    const today = clock_cjs_1.realClock.localToday();
     content = `completed: ${today}\n` + content;
     (0, shell_command_projection_cjs_1.platformWriteSync)(node_path_1.default.join(completedDir, filename), content);
     node_fs_1.default.unlinkSync(sourcePath);
@@ -1232,7 +1271,7 @@ function cmdTodoComplete(cwd, filename, raw) {
 function cmdScaffold(cwd, type, options, raw) {
     const { phase, name } = options;
     const padded = phase ? normalizePhaseName(phase) : '00';
-    const today = new Date().toISOString().split('T')[0];
+    const today = clock_cjs_1.realClock.localToday();
     // Find phase directory
     const phaseInfo = phase ? findPhaseInternal(cwd, phase) : null;
     const phaseDir = phaseInfo ? node_path_1.default.join(cwd, phaseInfo['directory']) : null;

package/gsd-core/bin/lib/config-loader.cjs

@@ -158,11 +158,15 @@ const _warnedUnknownConfigKeys = new Set();
 // ─── Git utilities ────────────────────────────────────────────────────────────
 const _gitIgnoredCache = new Map();
 function isGitIgnored(cwd, targetPath) {
-    const key = cwd + '::' + targetPath;
+    // #2206: strip trailing slashes — `git check-ignore` has a quirk where a
+    // CRLF .gitignore with blank lines falsely reports a trailing-slash path
+    // (e.g. `.planning/`) as ignored. Normalizing here protects every call site.
+    const normalized = targetPath.replace(/\/+$/, '');
+    const key = cwd + '::' + normalized;
     if (_gitIgnoredCache.has(key))
         return _gitIgnoredCache.get(key);
     // --no-index checks .gitignore rules regardless of whether the file is tracked.
-    const result = (0, shell_command_projection_cjs_1.execGit)(['check-ignore', '-q', '--no-index', '--', targetPath], { cwd });
+    const result = (0, shell_command_projection_cjs_1.execGit)(['check-ignore', '-q', '--no-index', '--', normalized], { cwd });
     const ignored = result.exitCode === 0;
     _gitIgnoredCache.set(key, ignored);
     return ignored;

package/gsd-core/bin/lib/config.cjs

@@ -692,6 +692,18 @@ function cmdConfigSet(cwd, keyPath, value, raw) {
     const VALID_CONTEXT_POSITIONS = ['front', 'end'];
     if (kp === 'statusline.context_position')
         assertEnumValue(parsedValue, val, VALID_CONTEXT_POSITIONS, 'statusline.context_position');
+    // statusline.show_context_tokens — boolean only
+    if (kp === 'statusline.show_context_tokens') {
+        if (typeof parsedValue !== 'boolean') {
+            error(`Invalid statusline.show_context_tokens '${val}'. Must be a boolean (true or false).`);
+        }
+    }
+    // statusline.show_git — boolean only
+    if (kp === 'statusline.show_git') {
+        if (typeof parsedValue !== 'boolean') {
+            error(`Invalid statusline.show_git '${val}'. Must be a boolean (true or false).`);
+        }
+    }
     // Fallow scope + profile enum validation (#3424)
     const VALID_FALLOW_SCOPES = ['phase', 'repo'];
     if (kp === 'code_quality.fallow.scope')

package/gsd-core/bin/lib/core-utils.cjs

@@ -27,10 +27,16 @@ const { comparePhaseNum } = phaseIdModule;
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const planningWorkspace = require("./planning-workspace.cjs");
 const { findContextMdIn } = planningWorkspace;
+// eslint-disable-next-line @typescript-eslint/no-require-imports
+const shellCommandProjection = require("./shell-command-projection.cjs");
 // ─── Path helpers ────────────────────────────────────────────────────────────
-/** Normalize a relative path to always use forward slashes (cross-platform). */
+/**
+ * Normalize a relative path to always use forward slashes (cross-platform).
+ * Delegates to the single separator seam in shell-command-projection so there is
+ * exactly one implementation of native→POSIX conversion across the codebase.
+ */
 function toPosixPath(p) {
-    return p.split(node_path_1.default.sep).join('/');
+    return shellCommandProjection.toPosixPath(p);
 }
 /**
  * Scan immediate child directories for separate git repos.

package/gsd-core/bin/lib/drift.cjs

@@ -69,7 +69,7 @@ const SAFE_PATH_RE = /^(?!.*\.\.)(?:[A-Za-z0-9_.][A-Za-z0-9_.\-]*)(?:\/[A-Za-z0-
 function classifyFile(file) {
     if (typeof file !== 'string' || !file)
         return null;
-    const norm = file.replace(/\\/g, '/');
+    const norm = (0, shell_command_projection_cjs_1.posixNormalize)(file);
     if (MIGRATION_RES.some((r) => r.test(norm)))
         return 'migration';
     if (ROUTE_RES.some((r) => r.test(norm)))
@@ -87,7 +87,7 @@ function classifyFile(file) {
  * check `structureMd.includes('src/lib')` holds.
  */
 function isPathMapped(file, structureMd) {
-    const norm = file.replace(/\\/g, '/');
+    const norm = (0, shell_command_projection_cjs_1.posixNormalize)(file);
     const parts = norm.split('/');
     // Check prefixes from longest to shortest; any hit means "mapped".
     for (let i = parts.length - 1; i >= 1; i--) {
@@ -130,7 +130,7 @@ function detectDrift(input) {
         const elements = [];
         const seen = new Map();
         for (const rawFile of added) {
-            const file = rawFile.replace(/\\/g, '/');
+            const file = (0, shell_command_projection_cjs_1.posixNormalize)(rawFile);
             const specific = classifyFile(file);
             let category = specific;
             if (!category) {
@@ -251,7 +251,7 @@ function chooseAffectedPaths(paths) {
     for (const raw of paths || []) {
         if (typeof raw !== 'string' || !raw)
             continue;
-        const file = raw.replace(/\\/g, '/');
+        const file = (0, shell_command_projection_cjs_1.posixNormalize)(raw);
         const parts = file.split('/');
         if (parts.length === 0)
             continue;

package/gsd-core/bin/lib/frontmatter.cjs

@@ -522,6 +522,27 @@ const FRONTMATTER_SCHEMAS = {
     summary: { required: ['phase', 'plan', 'subsystem', 'tags', 'duration', 'completed'] },
     verification: { required: ['phase', 'verified', 'status', 'score'] },
 };
+/**
+ * Strip ALL frontmatter blocks from the start of `content`.
+ *
+ * Handles CRLF line endings and multiple stacked blocks (corruption
+ * recovery): greedily strips consecutive `---...---` blocks separated by
+ * optional whitespace, so a doubled/tripled frontmatter header (e.g. from a
+ * botched merge) is fully removed, not just the first block.
+ *
+ * Canonical home for this primitive (#2143 audit dedup): previously
+ * duplicated byte-identically in both `state.cts` and `state-transition.cts`.
+ */
+function stripFrontmatter(content) {
+    let result = content;
+    while (true) {
+        const stripped = result.replace(/^\s*---\r?\n[\s\S]*?\r?\n---\s*/, '');
+        if (stripped === result)
+            break;
+        result = stripped;
+    }
+    return result;
+}
 function cmdFrontmatterGet(cwd, filePath, field, raw) {
     if (!filePath) {
         error('file path required');
@@ -654,6 +675,7 @@ module.exports = {
     parseFrontmatter: extractFrontmatter,
     reconstructFrontmatter,
     spliceFrontmatter,
+    stripFrontmatter,
     noOpObjectListSetError,
     parseMustHavesBlock,
     FRONTMATTER_SCHEMAS,

package/gsd-core/bin/lib/gsd2-import.cjs

@@ -26,6 +26,7 @@ const node_fs_1 = __importDefault(require("node:fs"));
 const node_path_1 = __importDefault(require("node:path"));
 const shell_command_projection_cjs_1 = require("./shell-command-projection.cjs");
 const runtime_slash_cjs_1 = require("./runtime-slash.cjs");
+const clock_cjs_1 = require("./clock.cjs");
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const ioMod = require("./io.cjs");
 const { output } = ioMod;
@@ -276,7 +277,7 @@ function buildStateMd(phaseMap) {
     const status = currentEntry ? 'Ready to plan' : 'All phases complete';
     const filled = Math.round(pct / 10);
     const bar = `[${'█'.repeat(filled)}${'░'.repeat(10 - filled)}]`;
-    const today = new Date().toISOString().split('T')[0];
+    const today = clock_cjs_1.realClock.localToday();
     return [
         '# Project State',
         '',

package/gsd-core/bin/lib/host-integration.cjs

@@ -430,14 +430,25 @@ function hookEventSurfaceFor(hookEvents) {
 // events (session/tool/file/permission); pi ~30 fine-grained extension events;
 // 'none' = the host exposes no extension surface and the engine owns the bus
 // (VS Code). Declarative hosts (no plugin API) do not set `extensionEvents`.
+// OpenCode's plugin event surface (ADR-1239 §research; ~25 documented events,
+// GSD binds this subset). Hoisted to a named const — rather than duplicated
+// object literals — so the `kilo` dialect below (#2093) can reuse the IDENTICAL
+// array instead of a copy-pasted one that could silently drift out of sync.
+const OPENCODE_EXTENSION_EVENTS = Object.freeze([
+    'session.created', 'session.idle', 'experimental.session.compacting',
+    'tool.execute.before', 'tool.execute.after', 'file.edited',
+    // #2087 — additional documented plugin events GSD binds (opencode.ai/docs/plugins):
+    // permission decisions + session error surface.
+    'permission.asked', 'permission.replied', 'session.error',
+]);
 const EXTENSION_EVENT_SURFACES = Object.freeze({
-    opencode: Object.freeze([
-        'session.created', 'session.idle', 'experimental.session.compacting',
-        'tool.execute.before', 'tool.execute.after', 'file.edited',
-        // #2087 — additional documented plugin events GSD binds (opencode.ai/docs/plugins):
-        // permission decisions + session error surface.
-        'permission.asked', 'permission.replied', 'session.error',
-    ]),
+    opencode: OPENCODE_EXTENSION_EVENTS,
+    // #2093 — Kilo Code is an OpenCode fork sharing the same plugin/extension
+    // event bus (host hook bus, UPGRADE 1): reuses OPENCODE_EXTENSION_EVENTS
+    // verbatim (not a re-derivation), so the two dialects stay pinned together
+    // by construction. See .kilo/plugins/gsd-core.js (copied verbatim from
+    // .opencode/plugins/gsd-core.js).
+    kilo: OPENCODE_EXTENSION_EVENTS,
     // #2091 — Hermes Agent real plugin hook vocabulary (13 events).
     // Cite: https://github.com/nousresearch/hermes-agent/blob/main/website/docs/user-guide/features/hooks.md
     // Replaces the borrowed `hookEvents: "claude"` 6-event surface that silently
@@ -451,7 +462,21 @@ const EXTENSION_EVENT_SURFACES = Object.freeze({
         'pre_gateway_dispatch', 'pre_approval_request',
         'transform_tool_result',
     ]),
-    pi: Object.freeze(['tool_call']),
+    // #2102 Stage 2 — pi's real ExtensionAPI event vocabulary (~30 fine-grained
+    // extension events; documentation-sourced, ADR-1239 §research). Replaces the
+    // placeholder single-event ['tool_call'] surface — the Stage 1 value only
+    // covered the one event pi/gsd.cjs happened to bind at the time, not the
+    // full declared surface.
+    pi: Object.freeze([
+        'session_start', 'project_trust', 'resources_discover', 'input',
+        'before_agent_start', 'agent_start', 'message_start', 'message_update',
+        'message_end', 'turn_start', 'context', 'before_provider_request',
+        'after_provider_response', 'tool_execution_start', 'tool_execution_update',
+        'tool_execution_end', 'tool_call', 'tool_result', 'turn_end', 'agent_end',
+        'session_before_switch', 'session_shutdown', 'session_before_fork',
+        'session_info_changed', 'session_before_compact', 'session_compact',
+        'session_before_tree', 'session_tree', 'thinking_level_select', 'model_select',
+    ]),
     none: Object.freeze([]),
 });
 /**