@zaip-ai/cli 1.0.4 → 1.0.7

package/dist/services/codex-subagent-hook-template.js

@@ -0,0 +1,250 @@
+export const CODEX_SUBAGENT_LIFECYCLE_HOOK = `import { existsSync } from "node:fs";
+import { promises as fs } from "node:fs";
+import { spawn } from "node:child_process";
+import { dirname, relative, resolve } from "node:path";
+import { fileURLToPath } from "node:url";
+
+const hookPath = fileURLToPath(import.meta.url);
+const repositoryRoot = resolve(dirname(hookPath), "..", "..");
+const diagnosticPath = resolve(
+  repositoryRoot,
+  ".agents",
+  "local",
+  "hooks",
+  "subagent-lifecycle.ndjson",
+);
+
+if (process.argv[2] === "--capture-runner") {
+  await runCaptureRunner(process.argv[3], process.argv.slice(4));
+  process.exit(0);
+}
+
+let raw = "";
+for await (const chunk of process.stdin) raw += chunk;
+
+try {
+  const event = JSON.parse(raw);
+  const cwd = text(event.cwd);
+  const scoped = cwd === null ? ".." : relative(repositoryRoot, resolve(cwd));
+  if (cwd === null || scoped.startsWith("..")) process.exit(0);
+  const eventName = text(event.hook_event_name);
+  const lifecycleEvent =
+    eventName === "SubagentStart" ? "start" : eventName === "SubagentStop" ? "stop" : null;
+  const session = text(event.session_id);
+  const turn = text(event.turn_id);
+  const agentId = text(event.agent_id);
+  const agentType = text(event.agent_type);
+  const model = text(event.model);
+  const reasoningEffort = reasoningEffortValue(
+    event.model_reasoning_effort ?? event.reasoning_effort,
+  );
+  const parentAgentId = text(event.parent_agent_id ?? event.parent_id);
+  const status = terminalStatus(event.status);
+  const required = [lifecycleEvent, session, turn, agentId, agentType];
+  if (lifecycleEvent === null) {
+    await diagnostic("ignored_unrecognized_event", { eventName });
+    process.exit(0);
+  }
+  const terminalFallback =
+    lifecycleEvent === "stop" &&
+    status !== null &&
+    agentId !== null &&
+    agentType === "zaip-agent-finalizer" &&
+    parentAgentId !== null &&
+    (session === null || turn === null);
+  if (
+    (!terminalFallback && required.some((value) => value === null)) ||
+    (lifecycleEvent === "start" && model === null)
+  ) {
+    await diagnostic("ignored_incomplete_event", {
+      eventName,
+      session,
+      turn,
+      agentId,
+      agentType,
+      missing_model: lifecycleEvent === "start" && model === null,
+    });
+    process.exit(0);
+  }
+  const candidates = [
+    resolve(repositoryRoot, "packages", "cli", "dist", "index.js"),
+    resolve(repositoryRoot, ".agents", "runtime", "bin", "zaip.mjs"),
+  ];
+  const cli = candidates.find(existsSync);
+  if (cli === undefined) {
+    await diagnostic("cli_not_found", { eventName, candidates });
+    process.exit(0);
+  }
+  const captureArguments = terminalFallback
+    ? [
+        "subagent",
+        "capture-terminal",
+        "--parent-agent-id",
+        parentAgentId,
+        "--agent-id",
+        agentId,
+        "--agent-type",
+        agentType,
+        "--status",
+        status,
+        "--json",
+      ]
+    : [
+    "subagent",
+    "capture",
+    "--event",
+    lifecycleEvent,
+    "--session",
+    session,
+    "--turn",
+    turn,
+    "--agent-id",
+    agentId,
+    "--agent-type",
+    agentType,
+    ...(model === null ? [] : ["--model", model]),
+    ...(reasoningEffort === null ? [] : ["--reasoning-effort", reasoningEffort]),
+    ...(parentAgentId === null ? [] : ["--parent-agent-id", parentAgentId]),
+    ...(lifecycleEvent !== "stop" || status === null ? [] : ["--status", status]),
+    "--json",
+  ];
+  const runner = spawn(
+    process.execPath,
+    [hookPath, "--capture-runner", cli, ...captureArguments],
+    {
+      cwd: repositoryRoot,
+      detached: true,
+      windowsHide: true,
+      stdio: "ignore",
+    },
+  );
+  runner.once("error", (error) =>
+    diagnostic("runner_spawn_failed", { eventName, error: error.message }),
+  );
+  runner.unref();
+  if (lifecycleEvent === "start") {
+    process.stdout.write(JSON.stringify({
+      hookSpecificOutput: {
+        hookEventName: "SubagentStart",
+        additionalContext:
+          "ZAIP delegation policy: work only as a cataloged zaip-agent-NOME identity. Delegation is recursive; do not use default, worker, explorer, or ad-hoc agent types.",
+      },
+    }));
+  }
+} catch (error) {
+  await diagnostic("hook_exception", {
+    error: error instanceof Error ? error.message : String(error),
+  });
+}
+
+async function runCaptureRunner(cli, captureArguments) {
+  try {
+    if (typeof cli !== "string" || cli.length === 0) {
+      await persistDiagnostic("runner_invalid_cli", {});
+      return;
+    }
+    const child = spawn(process.execPath, [cli, ...captureArguments], {
+      cwd: repositoryRoot,
+      windowsHide: true,
+      stdio: ["ignore", "pipe", "pipe"],
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (chunk) => {
+      stdout = boundedText(stdout, chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr = boundedText(stderr, chunk);
+    });
+    const outcome = await new Promise((resolveOutcome) => {
+      let settled = false;
+      const finish = (value) => {
+        if (settled) return;
+        settled = true;
+        clearTimeout(timeout);
+        resolveOutcome(value);
+      };
+      const timeout = setTimeout(() => {
+        child.kill();
+        finish({ kind: "timeout" });
+      }, 120_000);
+      child.once("error", (error) => finish({ kind: "error", error: error.message }));
+      child.once("close", (code, signal) => finish({ kind: "close", code, signal }));
+    });
+    if (outcome.kind === "timeout") {
+      await persistDiagnostic("capture_timeout", { captureArguments: safeIdentity(captureArguments) });
+    } else if (outcome.kind === "error") {
+      await persistDiagnostic("capture_spawn_failed", { error: outcome.error });
+    } else if (outcome.code !== 0) {
+      await persistDiagnostic("capture_exit_nonzero", {
+        code: outcome.code,
+        signal: outcome.signal,
+        stderr,
+        stdout,
+        captureArguments: safeIdentity(captureArguments),
+      });
+    }
+  } catch (error) {
+    await persistDiagnostic("runner_exception", {
+      error: error instanceof Error ? error.message : String(error),
+    });
+  }
+}
+
+function safeIdentity(arguments_) {
+  const value = (flag) => {
+    const index = arguments_.indexOf(flag);
+    return index < 0 ? null : text(arguments_[index + 1]);
+  };
+  return {
+    event: value("--event"),
+    session: value("--session"),
+    turn: value("--turn"),
+    agent_id: value("--agent-id"),
+    agent_type: value("--agent-type"),
+  };
+}
+
+function boundedText(current, chunk) {
+  return (current + String(chunk)).slice(-8_192);
+}
+
+async function persistDiagnostic(code, detail) {
+  const line = \`\${JSON.stringify({
+    source: "zaip-subagent-lifecycle-runner",
+    code,
+    occurred_at: new Date().toISOString(),
+    detail,
+  })}\\n\`;
+  await fs.mkdir(dirname(diagnosticPath), { recursive: true });
+  const size = await fs.stat(diagnosticPath).then((entry) => entry.size).catch(() => 0);
+  if (size + Buffer.byteLength(line) > 262_144) {
+    await fs.writeFile(diagnosticPath, "", "utf8");
+  }
+  await fs.appendFile(diagnosticPath, line, "utf8");
+}
+
+async function diagnostic(code, detail) {
+  await persistDiagnostic(code, detail);
+  process.stderr.write(
+    \`\${JSON.stringify({ source: "zaip-subagent-lifecycle", code, detail })}\\n\`,
+  );
+}
+
+function text(value) {
+  if (typeof value !== "string") return null;
+  const normalized = value.trim();
+  return normalized.length > 0 && normalized.length <= 200 ? normalized : null;
+}
+
+function reasoningEffortValue(value) {
+  const normalized = text(value);
+  return ["low", "medium", "high", "xhigh"].includes(normalized) ? normalized : null;
+}
+
+function terminalStatus(value) {
+  const normalized = text(value);
+  return ["completed", "failed", "cancelled"].includes(normalized) ? normalized : null;
+}
+`;
+//# sourceMappingURL=codex-subagent-hook-template.js.map

package/dist/services/codex-subagent-hook-template.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"codex-subagent-hook-template.js","sourceRoot":"","sources":["../../src/services/codex-subagent-hook-template.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,6BAA6B,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwP5C,CAAC"}

package/dist/services/doctor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/services/doctor.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;CACpC;AAsCD,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAmH5E"}
+{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../src/services/doctor.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,SAAS,aAAa,EAAE,CAAC;CACpC;AAsCD,wBAAsB,aAAa,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAuF5E"}

package/dist/services/doctor.js

@@ -6,7 +6,7 @@ import { sha256 } from "./template-manifest.js";
 const REQUIRED = [
     ".agents/config/project.yaml",
     ".agents/config/framework.lock.yaml",
-    ...["core", "workflow", "architecture", "security", "context"].map((name) => `.agents/rules/zaip/${name}.md`),
+    ...["core", "workflow", "architecture", "security", "context"].map((name) => `.agents/rules/${name}.md`),
     ...[
         "work-lifecycle",
         "execution-engine",
@@ -30,11 +30,11 @@ const REQUIRED_DESIGN = [
     ".agents/design/apps/catalog/dist/storybook/index.html",
 ];
 const REQUIRED_RUNTIME = [
-    ".zaip-aios/bin/zaip.mjs",
-    ".zaip-aios/checksums.sha256",
-    ".zaip-aios/manifest.json",
-    ".zaip-aios/sbom.cdx.json",
-    ".zaip-aios/VERSION",
+    ".agents/runtime/bin/zaip.mjs",
+    ".agents/runtime/checksums.sha256",
+    ".agents/runtime/manifest.json",
+    ".agents/runtime/sbom.cdx.json",
+    ".agents/runtime/VERSION",
 ];
 export async function doctorProject(directory) {
     const project = await findProjectRoot(directory);
@@ -87,41 +87,14 @@ export async function doctorProject(directory) {
     }
     const ids = new Map();
     for (const path of await filesUnder(project.root, ".agents/rules")) {
-        const isZaip = path.startsWith(".agents/rules/zaip/");
-        const isProject = path.startsWith(".agents/rules/project/");
-        if (/^\.agents\/rules\/[^/]+$/.test(path) || (!isZaip && !isProject)) {
+        if (!/^\.agents\/rules\/(?:project\/)?[^/]+\.md$/.test(path)) {
             findings.push({
                 severity: "error",
                 path,
-                message: "Rules must live under .agents/rules/zaip or .agents/rules/project",
+                message: "Rules must live under .agents/rules or .agents/rules/project as Markdown files",
             });
             continue;
         }
-        if ((isZaip && !path.endsWith(".md")) ||
-            (isProject && !path.endsWith(".md") && path !== ".agents/rules/project/.gitkeep")) {
-            findings.push({
-                severity: "error",
-                path,
-                message: "Rule namespaces accept Markdown Rules and the project .gitkeep marker only",
-            });
-            continue;
-        }
-        if (isZaip && !managed.has(path)) {
-            findings.push({
-                severity: "error",
-                path,
-                message: "ZAIP Rule must be managed by framework.lock.yaml",
-            });
-        }
-        if (isProject && path.endsWith(".md") && managed.has(path)) {
-            findings.push({
-                severity: "error",
-                path,
-                message: "Project Rule must not be managed by framework.lock.yaml",
-            });
-        }
-        if (!path.endsWith(".md"))
-            continue;
         const content = await textOrNull(project.root, path);
         const id = /^id:\s*(RULE-[A-Z0-9-]+)\s*$/m.exec(content ?? "")?.[1];
         if (id === undefined) {

package/dist/services/doctor.js.map

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

package/dist/services/global-codex-config.d.ts

@@ -1,20 +1,26 @@
-import { mkdir, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 export interface GlobalCodexConfigResult {
     path: string;
     sourcePath: string;
     installed: boolean;
     agentFilesInstalled: number;
+    removedRegistrations: number;
     error: string | null;
 }
-export interface GlobalCodexAgentFile {
-    name: string;
-    content: string;
-}
 export interface GlobalCodexConfigFileSystem {
     mkdir: typeof mkdir;
+    readFile: typeof readFile;
     rename: typeof rename;
     rm: typeof rm;
     writeFile: typeof writeFile;
 }
-export declare function installGlobalCodexConfig(content: string, codexHome?: string, sourcePath?: string, filesystem?: GlobalCodexConfigFileSystem, agentFiles?: readonly GlobalCodexAgentFile[]): Promise<GlobalCodexConfigResult>;
+/**
+ * Removes legacy global ZAIP registrations without copying a project configuration
+ * to the user profile. The project catalog is the sole source for agent profiles.
+ */
+export declare function reconcileGlobalCodexConfig(codexHome?: string, sourcePath?: string, filesystem?: GlobalCodexConfigFileSystem): Promise<GlobalCodexConfigResult>;
+export declare function stripLegacyRegistrations(config: string): {
+    content: string;
+    removedRegistrations: number;
+};
 //# sourceMappingURL=global-codex-config.d.ts.map

package/dist/services/global-codex-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-codex-config.d.ts","sourceRoot":"","sources":["../../src/services/global-codex-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAIhE,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,MAAM,EAAE,OAAO,MAAM,CAAC;IACtB,EAAE,EAAE,OAAO,EAAE,CAAC;IACd,SAAS,EAAE,OAAO,SAAS,CAAC;CAC7B;AAID,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,SAAS,SAAsD,EAC/D,UAAU,SAAiC,EAC3C,UAAU,GAAE,2BAA4C,EACxD,UAAU,GAAE,SAAS,oBAAoB,EAAO,GAC/C,OAAO,CAAC,uBAAuB,CAAC,CAmDlC"}
+{"version":3,"file":"global-codex-config.d.ts","sourceRoot":"","sources":["../../src/services/global-codex-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAI1E,MAAM,WAAW,uBAAuB;IACtC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED,MAAM,WAAW,2BAA2B;IAC1C,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,QAAQ,EAAE,OAAO,QAAQ,CAAC;IAC1B,MAAM,EAAE,OAAO,MAAM,CAAC;IACtB,EAAE,EAAE,OAAO,EAAE,CAAC;IACd,SAAS,EAAE,OAAO,SAAS,CAAC;CAC7B;AAMD;;;GAGG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,SAAsD,EAC/D,UAAU,SAAiD,EAC3D,UAAU,GAAE,2BAA4C,GACvD,OAAO,CAAC,uBAAuB,CAAC,CAmClC;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG;IACxD,OAAO,EAAE,MAAM,CAAC;IAChB,oBAAoB,EAAE,MAAM,CAAC;CAC9B,CASA"}

package/dist/services/global-codex-config.js

@@ -1,46 +1,35 @@
-import { mkdir, rename, rm, writeFile } from "node:fs/promises";
+import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join } from "node:path";
-const nodeFileSystem = { mkdir, rename, rm, writeFile };
-export async function installGlobalCodexConfig(content, codexHome = process.env.CODEX_HOME ?? join(homedir(), ".codex"), sourcePath = "<project>/.codex/config.toml", filesystem = nodeFileSystem, agentFiles = []) {
+const nodeFileSystem = { mkdir, readFile, rename, rm, writeFile };
+const TOML_TABLE = /^\[(?:[^\]]|\][^\]])+\](?:\r?\n|$)/;
+const LEGACY_ZAIP_AGENT_TABLE = /^\[agents\."zaip-agent-[^"]+"\](?:\r?\n|$)/;
+/**
+ * Removes legacy global ZAIP registrations without copying a project configuration
+ * to the user profile. The project catalog is the sole source for agent profiles.
+ */
+export async function reconcileGlobalCodexConfig(codexHome = process.env.CODEX_HOME ?? join(homedir(), ".codex"), sourcePath = "<project>/.agents/config/agents/catalog.yaml", filesystem = nodeFileSystem) {
     const path = join(codexHome, "config.toml");
     const temporary = `${path}.zaip-tmp-${process.pid}`;
     const backup = `${path}.zaip-backup-${process.pid}`;
-    let previousConfigMoved = false;
     try {
-        await filesystem.mkdir(dirname(path), { recursive: true });
-        for (const [index, agent] of agentFiles.entries()) {
-            if (!/^[a-z0-9][a-z0-9-]*\.toml$/.test(agent.name)) {
-                throw new Error(`Invalid global Codex agent filename: ${agent.name}`);
-            }
-            await replaceGlobalAgentFile(join(codexHome, "agents", agent.name), agent.content, index, filesystem);
-        }
-        await filesystem.rm(temporary, { force: true });
-        await filesystem.rm(backup, { force: true });
-        await filesystem.writeFile(temporary, content, { encoding: "utf8", flag: "wx" });
-        try {
-            await filesystem.rename(path, backup);
-            previousConfigMoved = true;
-        }
-        catch (error) {
-            if (!isMissingFile(error))
-                throw error;
-        }
-        try {
-            await filesystem.rename(temporary, path);
-        }
-        catch (error) {
-            if (previousConfigMoved)
-                await filesystem.rename(backup, path);
+        const current = await filesystem.readFile(path, "utf8").catch((error) => {
+            if (isMissingFile(error))
+                return null;
             throw error;
+        });
+        const { content, removedRegistrations } = current === null
+            ? { content: null, removedRegistrations: 0 }
+            : stripLegacyRegistrations(current);
+        if (content !== null && content !== current) {
+            await replaceConfig(path, content, temporary, backup, filesystem);
         }
-        if (previousConfigMoved)
-            await filesystem.rm(backup, { force: true });
         return {
             path,
             sourcePath,
             installed: true,
-            agentFilesInstalled: agentFiles.length,
+            agentFilesInstalled: 0,
+            removedRegistrations,
             error: null,
         };
     }
@@ -51,42 +40,72 @@ export async function installGlobalCodexConfig(content, codexHome = process.env.
             sourcePath,
             installed: false,
             agentFilesInstalled: 0,
+            removedRegistrations: 0,
             error: error instanceof Error ? error.message : String(error),
         };
     }
 }
-async function replaceGlobalAgentFile(path, content, index, filesystem) {
-    const temporary = `${path}.zaip-tmp-${process.pid}-${index}`;
-    const backup = `${path}.zaip-backup-${process.pid}-${index}`;
-    let previousMoved = false;
+export function stripLegacyRegistrations(config) {
+    const spans = legacyAgentTableSpans(config);
+    return {
+        content: spans.reduceRight((remaining, span) => remaining.slice(0, span.start) + remaining.slice(span.end), config),
+        removedRegistrations: spans.length,
+    };
+}
+function legacyAgentTableSpans(config) {
+    const tables = [];
+    let offset = 0;
+    let inMultilineBasic = false;
+    let inMultilineLiteral = false;
+    for (const line of config.matchAll(/.*(?:\r?\n|$)/g)) {
+        const text = line[0];
+        if (text.length === 0)
+            continue;
+        if (!inMultilineBasic && !inMultilineLiteral && TOML_TABLE.test(text)) {
+            tables.push({ start: offset, legacy: LEGACY_ZAIP_AGENT_TABLE.test(text) });
+        }
+        if (!inMultilineLiteral && hasUnescapedTripleQuote(text, '"""')) {
+            inMultilineBasic = !inMultilineBasic;
+        }
+        if (!inMultilineBasic && hasUnescapedTripleQuote(text, "'''")) {
+            inMultilineLiteral = !inMultilineLiteral;
+        }
+        offset += text.length;
+    }
+    return tables.flatMap((table, index) => table.legacy ? [{ start: table.start, end: tables[index + 1]?.start ?? config.length }] : []);
+}
+function hasUnescapedTripleQuote(line, quote) {
+    let occurrences = 0;
+    for (let index = line.indexOf(quote); index >= 0; index = line.indexOf(quote, index + 3)) {
+        if (quote === "'''" || line[index - 1] !== "\\")
+            occurrences += 1;
+    }
+    return occurrences % 2 === 1;
+}
+async function replaceConfig(path, content, temporary, backup, filesystem) {
+    let previousConfigMoved = false;
     await filesystem.mkdir(dirname(path), { recursive: true });
     await filesystem.rm(temporary, { force: true });
     await filesystem.rm(backup, { force: true });
     await filesystem.writeFile(temporary, content, { encoding: "utf8", flag: "wx" });
     try {
-        try {
-            await filesystem.rename(path, backup);
-            previousMoved = true;
-        }
-        catch (error) {
-            if (!isMissingFile(error))
-                throw error;
-        }
-        try {
-            await filesystem.rename(temporary, path);
-        }
-        catch (error) {
-            if (previousMoved)
-                await filesystem.rename(backup, path);
+        await filesystem.rename(path, backup);
+        previousConfigMoved = true;
+    }
+    catch (error) {
+        if (!isMissingFile(error))
             throw error;
-        }
-        if (previousMoved)
-            await filesystem.rm(backup, { force: true });
+    }
+    try {
+        await filesystem.rename(temporary, path);
     }
     catch (error) {
-        await filesystem.rm(temporary, { force: true }).catch(() => undefined);
+        if (previousConfigMoved)
+            await filesystem.rename(backup, path);
         throw error;
     }
+    if (previousConfigMoved)
+        await filesystem.rm(backup, { force: true });
 }
 function isMissingFile(error) {
     return typeof error === "object" && error !== null && "code" in error && error.code === "ENOENT";

package/dist/services/global-codex-config.js.map

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