@astrosheep/keiyaku 2.8.4 → 2.9.0

package/build/agents/{launch-snapshot_v2.js → launch-snapshot/model.js}

@@ -1,7 +1,5 @@
 import * as path from "node:path";
-import { nativePolicyOwnership } from "../config/provider-policy-ownership.js";
-import { FlowError } from "../flow-error.js";
-import { buildCodexAppServerWorkspaceWriteSandboxPolicy, configOwnsApprovalPolicy, configOwnsSandboxPolicy, } from "./providers/codex-app-server.js";
+import { FlowError } from "../../flow-error.js";
 const ACCESS_VALUES = new Set(["read", "write", "auto"]);
 const NETWORK_VALUES = new Set(["disabled", "enabled"]);
 const WEB_SEARCH_VALUES = new Set(["disabled", "cached", "live"]);
@@ -110,6 +108,42 @@ function assertEffortAllowed(effort, options) {
         return;
     throw new FlowError("INVALID_EFFORT_OVERRIDE", `Effort '${effort}' is not permitted; legal values: ${options.join(", ")}.`);
 }
+/** Effective effort requires an explicit effective model. Model without effort remains legal. */
+function assertEffortRequiresModel(model, effort, kind, akumaName) {
+    if (effort === undefined || model !== undefined)
+        return;
+    if (kind === "profile") {
+        throw new FlowError("INVALID_SETTINGS", `Akuma '${akumaName ?? ""}' sets effort '${effort}' without a model; set model whenever effort is configured.`);
+    }
+    throw new FlowError("INVALID_EFFORT_OVERRIDE", `Effort '${effort}' requires an explicit model.`);
+}
+function providerEffortAndModel(provider) {
+    switch (provider.kind) {
+        case "codex-sdk": {
+            const model = typeof provider.threadOptions.model === "string" ? provider.threadOptions.model : undefined;
+            const effort = typeof provider.threadOptions.modelReasoningEffort === "string"
+                ? provider.threadOptions.modelReasoningEffort
+                : undefined;
+            return { model, effort };
+        }
+        case "codex-app-server":
+        case "claude-agent-sdk":
+        case "opencode-sdk":
+            return { model: provider.model, effort: provider.effort };
+        case "pi":
+            return { model: provider.model, effort: provider.thinkingLevel };
+    }
+}
+function assertSnapshotEffortRequiresModel(snapshot) {
+    const fromAkuma = { model: snapshot.akuma.model, effort: snapshot.akuma.effort };
+    if (fromAkuma.effort !== undefined && fromAkuma.model === undefined) {
+        throw snapshotError("akuma.effort", "requires akuma.model");
+    }
+    const fromProvider = providerEffortAndModel(snapshot.provider);
+    if (fromProvider.effort !== undefined && fromProvider.model === undefined) {
+        throw snapshotError(`provider.${snapshot.provider.kind === "codex-sdk" ? "threadOptions.modelReasoningEffort" : snapshot.provider.kind === "pi" ? "thinkingLevel" : "effort"}`, "requires an explicit model");
+    }
+}
 function parsePolicy(value) {
     const policy = objectAt(value, "akuma.policy");
     exactKeys(policy, ["access", "network", "webSearch"], "akuma.policy");
@@ -153,6 +187,21 @@ function parseProviderCommon(provider) {
 function optionalJsonObject(provider, key) {
     return key in provider ? cloneJsonObject(provider[key], `provider.${key}`) : undefined;
 }
+function optionalStringRecord(provider, key) {
+    if (!(key in provider))
+        return undefined;
+    const value = provider[key];
+    if (!isPlainObject(value))
+        throw snapshotError(`provider.${key}`, "must be a plain JSON object");
+    const result = {};
+    for (const [entryKey, entryValue] of Object.entries(value)) {
+        if (typeof entryValue !== "string") {
+            throw snapshotError(`provider.${key}.${entryKey}`, "must be a string");
+        }
+        result[entryKey] = entryValue;
+    }
+    return Object.freeze(result);
+}
 function parseSandboxPolicy(value) {
     const sandbox = objectAt(value, "provider.sandboxPolicy");
     exactKeys(sandbox, ["type", "writableRoots", "networkAccess", "excludeTmpdirEnvVar", "excludeSlashTmp"], "provider.sandboxPolicy");
@@ -198,7 +247,7 @@ function parseProvider(value) {
             return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(profile !== undefined ? { profile } : {}), ...(config !== undefined ? { config } : {}), threadOptions: cloneJsonObject(provider.threadOptions, "provider.threadOptions") });
         }
         case "codex-app-server": {
-            exactKeys(provider, ["name", "source", "kind", "executable", "profile", "config", "model", "effort", "sandboxPolicy", "approvalPolicy"], "provider");
+            exactKeys(provider, ["name", "source", "kind", "executable", "profile", "config", "model", "effort", "sandboxPolicy", "approvalPolicy", "env"], "provider");
             if ("approvalPolicy" in provider && provider.approvalPolicy !== "never")
                 throw snapshotError("provider.approvalPolicy", "must equal 'never'");
             const executable = optionalString(provider, "executable", "provider");
@@ -207,10 +256,11 @@ function parseProvider(value) {
             const model = optionalString(provider, "model", "provider");
             const effort = optionalString(provider, "effort", "provider");
             const sandboxPolicy = "sandboxPolicy" in provider ? parseSandboxPolicy(provider.sandboxPolicy) : undefined;
-            return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(profile !== undefined ? { profile } : {}), ...(config !== undefined ? { config } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(sandboxPolicy !== undefined ? { sandboxPolicy } : {}), ...(provider.approvalPolicy === "never" ? { approvalPolicy: "never" } : {}) });
+            const env = optionalStringRecord(provider, "env");
+            return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(profile !== undefined ? { profile } : {}), ...(config !== undefined ? { config } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(sandboxPolicy !== undefined ? { sandboxPolicy } : {}), ...(provider.approvalPolicy === "never" ? { approvalPolicy: "never" } : {}), ...(env !== undefined ? { env } : {}) });
         }
         case "claude-agent-sdk": {
-            exactKeys(provider, ["name", "source", "kind", "executable", "model", "effort", "settingSources", "permissionMode", "allowDangerouslySkipPermissions", "disallowedTools"], "provider");
+            exactKeys(provider, ["name", "source", "kind", "executable", "model", "effort", "settingSources", "permissionMode", "allowDangerouslySkipPermissions", "disallowedTools", "env"], "provider");
             const modes = new Set(["default", "plan", "acceptEdits", "bypassPermissions"]);
             const permissionMode = requiredEnum(provider, "permissionMode", "provider", modes);
             if (permissionMode === "bypassPermissions") {
@@ -240,20 +290,23 @@ function parseProvider(value) {
             const executable = optionalString(provider, "executable", "provider");
             const model = optionalString(provider, "model", "provider");
             const effort = optionalString(provider, "effort", "provider");
-            return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(settingSources !== undefined ? { settingSources } : {}), permissionMode, ...(permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}), ...(disallowedTools !== undefined ? { disallowedTools } : {}) });
+            const env = optionalStringRecord(provider, "env");
+            return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(settingSources !== undefined ? { settingSources } : {}), permissionMode, ...(permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}), ...(disallowedTools !== undefined ? { disallowedTools } : {}), ...(env !== undefined ? { env } : {}) });
         }
         case "opencode-sdk": {
-            exactKeys(provider, ["name", "source", "kind", "executable", "model", "effort"], "provider");
+            exactKeys(provider, ["name", "source", "kind", "executable", "model", "effort", "env"], "provider");
             const executable = optionalString(provider, "executable", "provider");
             const model = optionalString(provider, "model", "provider");
             const effort = optionalString(provider, "effort", "provider");
-            return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}) });
+            const env = optionalStringRecord(provider, "env");
+            return Object.freeze({ ...common, kind, ...(executable !== undefined ? { executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(env !== undefined ? { env } : {}) });
         }
         case "pi": {
-            exactKeys(provider, ["name", "source", "kind", "model", "thinkingLevel"], "provider");
+            exactKeys(provider, ["name", "source", "kind", "model", "thinkingLevel", "env"], "provider");
             const model = optionalString(provider, "model", "provider");
             const thinkingLevel = optionalString(provider, "thinkingLevel", "provider");
-            return Object.freeze({ ...common, kind, ...(model !== undefined ? { model } : {}), ...(thinkingLevel !== undefined ? { thinkingLevel } : {}) });
+            const env = optionalStringRecord(provider, "env");
+            return Object.freeze({ ...common, kind, ...(model !== undefined ? { model } : {}), ...(thinkingLevel !== undefined ? { thinkingLevel } : {}), ...(env !== undefined ? { env } : {}) });
         }
         default:
             throw snapshotError("provider.kind", `has invalid value '${kind}'`);
@@ -268,72 +321,13 @@ export function parseResolvedAkumaLaunchSnapshot(value) {
         throw snapshotError("akuma", "is required");
     if (!("provider" in snapshot))
         throw snapshotError("provider", "is required");
-    return Object.freeze({ version: 1, akuma: parseAkuma(snapshot.akuma), provider: parseProvider(snapshot.provider) });
-}
-export function resolveAkumaLaunchSnapshot(selected, input) {
-    const model = input.model ?? selected.profile.model;
-    const effort = input.effort ?? selected.profile.effort;
-    assertEffortAllowed(effort, selected.profile.effortOptions);
-    const policy = {
-        ...(selected.profile.access !== undefined ? { access: selected.profile.access } : {}),
-        ...(selected.profile.network !== undefined ? { network: selected.profile.network } : {}),
-        ...(selected.profile.webSearch !== undefined ? { webSearch: selected.profile.webSearch } : {}),
-    };
-    const akuma = {
-        name: selected.name,
-        source: selected.definition.source,
-        body: selected.definition.body,
-        ...(selected.profile.description !== undefined ? { description: selected.profile.description } : {}),
-        ...(model !== undefined ? { model } : {}),
-        ...(effort !== undefined ? { effort } : {}),
-        ...(selected.profile.effortOptions !== undefined ? { effortOptions: selected.profile.effortOptions } : {}),
-        policy,
-    };
-    const instance = selected.profile.providerInstance;
-    const common = { name: selected.profile.provider, source: selected.profile.providerSource, kind: instance.kind };
-    let provider;
-    switch (instance.kind) {
-        case "codex-sdk": {
-            const threadOptions = { ...(instance.threadOptions ?? {}) };
-            const ownership = nativePolicyOwnership(selected.profile.provider, instance);
-            if (ownership.access.length === 0) {
-                threadOptions.sandboxMode = selected.profile.access === "read" ? "read-only" : selected.profile.access === "auto" ? "danger-full-access" : "workspace-write";
-            }
-            if (ownership.network.length === 0)
-                threadOptions.networkAccessEnabled = selected.profile.network === "enabled";
-            if (ownership.webSearch.length === 0)
-                threadOptions.webSearchMode = selected.profile.webSearch ?? "disabled";
-            if (model !== undefined)
-                threadOptions.model = model;
-            if (effort !== undefined)
-                threadOptions.modelReasoningEffort = effort;
-            threadOptions.workingDirectory = input.executionCwd;
-            threadOptions.skipGitRepoCheck = true;
-            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(instance.profile !== undefined ? { profile: instance.profile } : {}), ...(instance.config !== undefined ? { config: instance.config } : {}), threadOptions };
-            break;
-        }
-        case "codex-app-server": {
-            const roots = [path.resolve(input.executionCwd), ...(instance.writableRoots ?? []).map((root) => path.resolve(input.projectRoot, root))];
-            const writableRoots = [...new Set(roots)];
-            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(instance.profile !== undefined ? { profile: instance.profile } : {}), ...(instance.config !== undefined ? { config: instance.config } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(!configOwnsSandboxPolicy(instance.config) ? { sandboxPolicy: buildCodexAppServerWorkspaceWriteSandboxPolicy({ writableRoots, networkAccess: selected.profile.network === "enabled" }) } : {}), ...(!configOwnsApprovalPolicy(instance.config) ? { approvalPolicy: "never" } : {}) };
-            break;
-        }
-        case "claude-agent-sdk": {
-            const permissionMode = selected.profile.access === "read" ? "plan" : selected.profile.access === "write" ? "acceptEdits" : selected.profile.access === "auto" ? "bypassPermissions" : "default";
-            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(instance.settingSources !== undefined ? { settingSources: instance.settingSources } : {}), permissionMode, ...(permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}), ...(selected.profile.webSearch === "disabled" ? { disallowedTools: ["WebSearch"] } : {}) };
-            break;
-        }
-        case "opencode-sdk":
-            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}) };
-            break;
-        case "pi":
-            provider = { ...common, ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { thinkingLevel: effort } : {}) };
-            break;
-    }
-    return parseResolvedAkumaLaunchSnapshot({ version: 1, akuma, provider });
+    const parsed = Object.freeze({ version: 1, akuma: parseAkuma(snapshot.akuma), provider: parseProvider(snapshot.provider) });
+    assertSnapshotEffortRequiresModel(parsed);
+    return parsed;
 }
 export function applySnapshotEffort(snapshot, effort) {
     assertEffortAllowed(effort, snapshot.akuma.effortOptions);
+    assertEffortRequiresModel(snapshot.akuma.model, effort, "override");
     const akuma = { ...snapshot.akuma, effort };
     let provider;
     switch (snapshot.provider.kind) {
@@ -351,3 +345,4 @@ export function applySnapshotEffort(snapshot, effort) {
     }
     return parseResolvedAkumaLaunchSnapshot({ version: 1, akuma, provider });
 }
+export { assertEffortAllowed, assertEffortRequiresModel };

package/build/agents/launch-snapshot/resolve.js

@@ -0,0 +1,72 @@
+import * as path from "node:path";
+import { nativePolicyOwnership } from "../../config/provider-policy-ownership.js";
+import { buildCodexAppServerWorkspaceWriteSandboxPolicy, configOwnsApprovalPolicy, configOwnsSandboxPolicy, } from "../providers/codex-app-server/adapter.js";
+import { assertEffortAllowed, assertEffortRequiresModel, parseResolvedAkumaLaunchSnapshot, } from "./model.js";
+export function resolveAkumaLaunchSnapshot(selected, input) {
+    const model = input.model ?? selected.profile.model;
+    const effort = input.effort ?? selected.profile.effort;
+    assertEffortAllowed(effort, selected.profile.effortOptions);
+    if (input.effort !== undefined) {
+        assertEffortRequiresModel(model, effort, "override");
+    }
+    else {
+        assertEffortRequiresModel(model, effort, "profile", selected.name);
+    }
+    const policy = {
+        ...(selected.profile.access !== undefined ? { access: selected.profile.access } : {}),
+        ...(selected.profile.network !== undefined ? { network: selected.profile.network } : {}),
+        ...(selected.profile.webSearch !== undefined ? { webSearch: selected.profile.webSearch } : {}),
+    };
+    const akuma = {
+        name: selected.name,
+        source: selected.definition.source,
+        body: selected.definition.body,
+        ...(selected.profile.description !== undefined ? { description: selected.profile.description } : {}),
+        ...(model !== undefined ? { model } : {}),
+        ...(effort !== undefined ? { effort } : {}),
+        ...(selected.profile.effortOptions !== undefined ? { effortOptions: selected.profile.effortOptions } : {}),
+        policy,
+    };
+    const instance = selected.profile.providerInstance;
+    const common = { name: selected.profile.provider, source: selected.profile.providerSource, kind: instance.kind };
+    let provider;
+    switch (instance.kind) {
+        case "codex-sdk": {
+            const threadOptions = { ...(instance.threadOptions ?? {}) };
+            const ownership = nativePolicyOwnership(selected.profile.provider, instance);
+            if (ownership.access.length === 0) {
+                threadOptions.sandboxMode = selected.profile.access === "read" ? "read-only" : selected.profile.access === "auto" ? "danger-full-access" : "workspace-write";
+            }
+            if (ownership.network.length === 0)
+                threadOptions.networkAccessEnabled = selected.profile.network === "enabled";
+            if (ownership.webSearch.length === 0)
+                threadOptions.webSearchMode = selected.profile.webSearch ?? "disabled";
+            if (model !== undefined)
+                threadOptions.model = model;
+            if (effort !== undefined)
+                threadOptions.modelReasoningEffort = effort;
+            threadOptions.workingDirectory = input.executionCwd;
+            threadOptions.skipGitRepoCheck = true;
+            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(instance.profile !== undefined ? { profile: instance.profile } : {}), ...(instance.config !== undefined ? { config: instance.config } : {}), threadOptions };
+            break;
+        }
+        case "codex-app-server": {
+            const roots = [path.resolve(input.executionCwd), ...(instance.writableRoots ?? []).map((root) => path.resolve(input.projectRoot, root))];
+            const writableRoots = [...new Set(roots)];
+            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(instance.profile !== undefined ? { profile: instance.profile } : {}), ...(instance.config !== undefined ? { config: instance.config } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(!configOwnsSandboxPolicy(instance.config) ? { sandboxPolicy: buildCodexAppServerWorkspaceWriteSandboxPolicy({ writableRoots, networkAccess: selected.profile.network === "enabled" }) } : {}), ...(!configOwnsApprovalPolicy(instance.config) ? { approvalPolicy: "never" } : {}), ...(instance.env !== undefined ? { env: instance.env } : {}) };
+            break;
+        }
+        case "claude-agent-sdk": {
+            const permissionMode = selected.profile.access === "read" ? "plan" : selected.profile.access === "write" ? "acceptEdits" : selected.profile.access === "auto" ? "bypassPermissions" : "default";
+            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(instance.settingSources !== undefined ? { settingSources: instance.settingSources } : {}), permissionMode, ...(permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {}), ...(selected.profile.webSearch === "disabled" ? { disallowedTools: ["WebSearch"] } : {}), ...(instance.env !== undefined ? { env: instance.env } : {}) };
+            break;
+        }
+        case "opencode-sdk":
+            provider = { ...common, ...(instance.executable !== undefined ? { executable: instance.executable } : {}), ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { effort } : {}), ...(instance.env !== undefined ? { env: instance.env } : {}) };
+            break;
+        case "pi":
+            provider = { ...common, ...(model !== undefined ? { model } : {}), ...(effort !== undefined ? { thinkingLevel: effort } : {}), ...(instance.env !== undefined ? { env: instance.env } : {}) };
+            break;
+    }
+    return parseResolvedAkumaLaunchSnapshot({ version: 1, akuma, provider });
+}

package/build/agents/opencode-sdk.js

@@ -51,7 +51,7 @@ export async function createOpencodeServer(options = {}) {
     const startupTimeoutMs = options.startupTimeoutMs ?? DEFAULT_STARTUP_TIMEOUT_MS;
     const child = spawn(executable, [OPENCODE_SERVE_SUBCOMMAND, OPENCODE_HOSTNAME_FLAG, hostname, OPENCODE_PORT_FLAG, String(port)], {
         cwd: directory,
-        env: { ...process.env, ...(options.env ?? {}) },
+        env: options.env !== undefined ? { ...options.env } : { ...process.env },
         stdio: ["ignore", "pipe", "pipe"],
     });
     let exited = false;
@@ -60,10 +60,30 @@ export async function createOpencodeServer(options = {}) {
     child.on("error", (error) => { stderr += `${stderr ? " " : ""}${error.message}`; });
     child.on("close", () => { exited = true; });
     const client = createOpencodeClient({ baseUrl: url, directory });
-    const stop = async () => {
+    let gracefulStop;
+    let forceStop;
+    const stop = async (mode = "graceful") => {
         if (exited)
             return;
-        await new Promise((resolve) => {
+        if (mode === "force") {
+            forceStop ??= new Promise((resolve, reject) => {
+                child.once("close", resolve);
+                try {
+                    if (!child.kill("SIGKILL") && !exited)
+                        reject(new Error("OpenCode server force kill failed"));
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+            await forceStop;
+            return;
+        }
+        if (forceStop) {
+            await forceStop;
+            return;
+        }
+        gracefulStop ??= new Promise((resolve) => {
             let settled = false;
             let forceKill;
             const finish = () => {
@@ -82,6 +102,7 @@ export async function createOpencodeServer(options = {}) {
             }, SERVER_SHUTDOWN_FORCE_KILL_MS);
             forceKill.unref();
         });
+        await gracefulStop;
     };
     try {
         await waitForServerReady(client, directory, startupTimeoutMs, options.signal);