@botiverse/oar 0.124.0 → 0.125.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/contracts/context-usage.d.ts +3 -1
- package/dist/contracts/context-usage.d.ts.map +1 -1
- package/dist/contracts/runtime.d.ts +4 -2
- package/dist/contracts/runtime.d.ts.map +1 -1
- package/dist/contracts/runtime.js.map +1 -1
- package/dist/contracts/session-options.d.ts +15 -31
- package/dist/contracts/session-options.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.d.ts +3 -2
- package/dist/runtimes/antigravity/account-usage.d.ts.map +1 -1
- package/dist/runtimes/antigravity/account-usage.js +10 -6
- package/dist/runtimes/antigravity/account-usage.js.map +1 -1
- package/dist/runtimes/antigravity/account.d.ts +37 -0
- package/dist/runtimes/antigravity/account.d.ts.map +1 -0
- package/dist/runtimes/antigravity/account.js +119 -0
- package/dist/runtimes/antigravity/account.js.map +1 -0
- package/dist/runtimes/antigravity/auth-status.d.ts +9 -0
- package/dist/runtimes/antigravity/auth-status.d.ts.map +1 -0
- package/dist/runtimes/antigravity/auth-status.js +54 -0
- package/dist/runtimes/antigravity/auth-status.js.map +1 -0
- package/dist/runtimes/antigravity/auth.d.ts +2 -6
- package/dist/runtimes/antigravity/auth.d.ts.map +1 -1
- package/dist/runtimes/antigravity/auth.js +10 -50
- package/dist/runtimes/antigravity/auth.js.map +1 -1
- package/dist/runtimes/antigravity/index.d.ts +2 -3
- package/dist/runtimes/antigravity/index.d.ts.map +1 -1
- package/dist/runtimes/antigravity/index.js +2 -3
- package/dist/runtimes/antigravity/index.js.map +1 -1
- package/dist/runtimes/antigravity/logout.d.ts.map +1 -1
- package/dist/runtimes/antigravity/logout.js +2 -0
- package/dist/runtimes/antigravity/logout.js.map +1 -1
- package/dist/runtimes/antigravity/token-email.d.ts +37 -0
- package/dist/runtimes/antigravity/token-email.d.ts.map +1 -0
- package/dist/runtimes/antigravity/token-email.js +155 -0
- package/dist/runtimes/antigravity/token-email.js.map +1 -0
- package/dist/runtimes/claude/index.d.ts +1 -2
- package/dist/runtimes/claude/index.d.ts.map +1 -1
- package/dist/runtimes/claude/launch-args.d.ts +3 -0
- package/dist/runtimes/claude/launch-args.d.ts.map +1 -1
- package/dist/runtimes/claude/launch-args.js +11 -1
- package/dist/runtimes/claude/launch-args.js.map +1 -1
- package/dist/runtimes/claude/launch.d.ts.map +1 -1
- package/dist/runtimes/claude/launch.js +2 -3
- package/dist/runtimes/claude/launch.js.map +1 -1
- package/dist/runtimes/claude/mcp-config.d.ts.map +1 -1
- package/dist/runtimes/claude/mcp-config.js +4 -2
- package/dist/runtimes/claude/mcp-config.js.map +1 -1
- package/dist/runtimes/claude/options.d.ts +1 -0
- package/dist/runtimes/claude/options.d.ts.map +1 -1
- package/dist/runtimes/claude/options.js +2 -0
- package/dist/runtimes/claude/options.js.map +1 -1
- package/dist/runtimes/claude/update.d.ts +17 -9
- package/dist/runtimes/claude/update.d.ts.map +1 -1
- package/dist/runtimes/claude/update.js +151 -34
- package/dist/runtimes/claude/update.js.map +1 -1
- package/dist/runtimes/claude/user-configuration.js +1 -1
- package/dist/runtimes/claude/user-configuration.js.map +1 -1
- package/dist/runtimes/codex/app-server-client.d.ts.map +1 -1
- package/dist/runtimes/codex/app-server-client.js +3 -9
- package/dist/runtimes/codex/app-server-client.js.map +1 -1
- package/dist/runtimes/codex/open-config.d.ts +6 -0
- package/dist/runtimes/codex/open-config.d.ts.map +1 -0
- package/dist/runtimes/codex/open-config.js +28 -0
- package/dist/runtimes/codex/open-config.js.map +1 -0
- package/dist/runtimes/codex/session.js +3 -3
- package/dist/runtimes/codex/session.js.map +1 -1
- package/dist/runtimes/codex/tool-denials.d.ts +0 -3
- package/dist/runtimes/codex/tool-denials.d.ts.map +1 -1
- package/dist/runtimes/codex/tool-denials.js +0 -8
- package/dist/runtimes/codex/tool-denials.js.map +1 -1
- package/dist/runtimes/cursor/model.d.ts.map +1 -1
- package/dist/runtimes/cursor/model.js +1 -0
- package/dist/runtimes/cursor/model.js.map +1 -1
- package/dist/runtimes/devin/options.d.ts.map +1 -1
- package/dist/runtimes/devin/options.js +1 -0
- package/dist/runtimes/devin/options.js.map +1 -1
- package/dist/runtimes/dsh/control.js +3 -3
- package/dist/runtimes/dsh/control.js.map +1 -1
- package/dist/runtimes/dsh/session.d.ts.map +1 -1
- package/dist/runtimes/dsh/session.js +2 -1
- package/dist/runtimes/dsh/session.js.map +1 -1
- package/dist/runtimes/factory/client.d.ts.map +1 -1
- package/dist/runtimes/factory/client.js +3 -9
- package/dist/runtimes/factory/client.js.map +1 -1
- package/dist/runtimes/opencode/inline-prompt-config.d.ts +5 -0
- package/dist/runtimes/opencode/inline-prompt-config.d.ts.map +1 -0
- package/dist/runtimes/opencode/inline-prompt-config.js +82 -0
- package/dist/runtimes/opencode/inline-prompt-config.js.map +1 -0
- package/dist/runtimes/opencode/prompt-config-v2.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config-v2.js +13 -9
- package/dist/runtimes/opencode/prompt-config-v2.js.map +1 -1
- package/dist/runtimes/opencode/prompt-config.d.ts +3 -4
- package/dist/runtimes/opencode/prompt-config.d.ts.map +1 -1
- package/dist/runtimes/opencode/prompt-config.js +27 -25
- package/dist/runtimes/opencode/prompt-config.js.map +1 -1
- package/dist/runtimes/pi/open.d.ts.map +1 -1
- package/dist/runtimes/pi/open.js +3 -1
- package/dist/runtimes/pi/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/control.js +3 -3
- package/dist/runtimes/pi/rpc/control.js.map +1 -1
- package/dist/runtimes/pi/rpc/extension.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/extension.js +14 -2
- package/dist/runtimes/pi/rpc/extension.js.map +1 -1
- package/dist/runtimes/pi/rpc/open.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/open.js +5 -2
- package/dist/runtimes/pi/rpc/open.js.map +1 -1
- package/dist/runtimes/pi/rpc/prompt-files.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/prompt-files.js +9 -4
- package/dist/runtimes/pi/rpc/prompt-files.js.map +1 -1
- package/dist/runtimes/pi/rpc/session.d.ts.map +1 -1
- package/dist/runtimes/pi/rpc/session.js +2 -1
- package/dist/runtimes/pi/rpc/session.js.map +1 -1
- package/dist/runtimes/qoder/projection.js +2 -2
- package/dist/runtimes/qoder/projection.js.map +1 -1
- package/dist/runtimes/qwen/control.d.ts +1 -1
- package/dist/runtimes/qwen/control.d.ts.map +1 -1
- package/dist/runtimes/qwen/control.js +3 -5
- package/dist/runtimes/qwen/control.js.map +1 -1
- package/dist/runtimes/qwen/session.js +1 -1
- package/dist/runtimes/qwen/session.js.map +1 -1
- package/dist/shared/acp/effort.d.ts.map +1 -1
- package/dist/shared/acp/effort.js +5 -0
- package/dist/shared/acp/effort.js.map +1 -1
- package/dist/shared/acp/errors.d.ts +1 -1
- package/dist/shared/acp/errors.d.ts.map +1 -1
- package/dist/shared/acp/errors.js +3 -11
- package/dist/shared/acp/errors.js.map +1 -1
- package/dist/shared/acp/process.d.ts +5 -1
- package/dist/shared/acp/process.d.ts.map +1 -1
- package/dist/shared/acp/process.js +18 -5
- package/dist/shared/acp/process.js.map +1 -1
- package/dist/shared/acp/routing-types.d.ts +3 -1
- package/dist/shared/acp/routing-types.d.ts.map +1 -1
- package/dist/shared/acp/routing.d.ts.map +1 -1
- package/dist/shared/acp/routing.js +5 -3
- package/dist/shared/acp/routing.js.map +1 -1
- package/dist/shared/acp/session.d.ts.map +1 -1
- package/dist/shared/acp/session.js +5 -2
- package/dist/shared/acp/session.js.map +1 -1
- package/dist/shared/acp/shared-session.d.ts.map +1 -1
- package/dist/shared/acp/shared-session.js +17 -5
- package/dist/shared/acp/shared-session.js.map +1 -1
- package/dist/shared/executable/reported-stderr.d.ts +8 -0
- package/dist/shared/executable/reported-stderr.d.ts.map +1 -1
- package/dist/shared/executable/reported-stderr.js +21 -0
- package/dist/shared/executable/reported-stderr.js.map +1 -1
- package/dist/shared/mcp-config-handoff.d.ts +1 -1
- package/dist/shared/mcp-config-handoff.d.ts.map +1 -1
- package/dist/shared/mcp-config-handoff.js +5 -1
- package/dist/shared/mcp-config-handoff.js.map +1 -1
- package/dist/shared/stream-json/compaction.d.ts +0 -1
- package/dist/shared/stream-json/compaction.d.ts.map +1 -1
- package/dist/shared/stream-json/compaction.js +1 -1
- package/dist/shared/stream-json/compaction.js.map +1 -1
- package/dist/shared/stream-json/held-input.d.ts.map +1 -1
- package/dist/shared/stream-json/held-input.js +0 -4
- package/dist/shared/stream-json/held-input.js.map +1 -1
- package/dist/shared/stream-json/input-lifecycle.d.ts.map +1 -1
- package/dist/shared/stream-json/input-lifecycle.js +8 -0
- package/dist/shared/stream-json/input-lifecycle.js.map +1 -1
- package/dist/shared/stream-json/profile.d.ts +0 -2
- package/dist/shared/stream-json/profile.d.ts.map +1 -1
- package/dist/shared/stream-json/projection.js +1 -1
- package/dist/shared/stream-json/projection.js.map +1 -1
- package/dist/shared/stream-json/session.d.ts.map +1 -1
- package/dist/shared/stream-json/session.js +11 -20
- package/dist/shared/stream-json/session.js.map +1 -1
- package/dist/shared/stream-json/state.d.ts +2 -2
- package/dist/shared/stream-json/state.d.ts.map +1 -1
- package/dist/shared/stream-json/state.js.map +1 -1
- package/package.json +2 -1
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import type { RefusedSessionOptions } from "../../contracts/runtime.js";
|
|
2
|
+
export declare const claudeMcpCredentialRefusal = "OAR has not verified that Claude reads a regular-file MCP configuration only at startup";
|
|
2
3
|
export declare const claudeRefusedSessionOptions: RefusedSessionOptions;
|
|
3
4
|
//# sourceMappingURL=options.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,eAAO,MAAM,2BAA2B,EAAE,
|
|
1
|
+
{"version":3,"file":"options.d.ts","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAExE,eAAO,MAAM,0BAA0B,4FAA4F,CAAC;AAEpI,eAAO,MAAM,2BAA2B,EAAE,qBAKzC,CAAC"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
|
+
export const claudeMcpCredentialRefusal = "OAR has not verified that Claude reads a regular-file MCP configuration only at startup";
|
|
1
2
|
export const claudeRefusedSessionOptions = {
|
|
3
|
+
...(process.platform === "win32" ? { mcpServerCredentials: claudeMcpCredentialRefusal } : {}),
|
|
2
4
|
goals: "Claude /goal is a prompt command, not a structured native goal control",
|
|
3
5
|
endTurnProcessesOnAbort: "OAR has not verified reading and ending one aborted Claude turn's processes while its session stays usable",
|
|
4
6
|
nativeMemoryDefault: "Claude Code has no configuration layer below user settings for a soft native-memory default",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"options.js","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,2BAA2B,GAA0B;IAChE,KAAK,EAAE,wEAAwE;IAC/E,uBAAuB,EAAE,4GAA4G;IACrI,mBAAmB,EAAE,6FAA6F;CACnH,CAAC"}
|
|
1
|
+
{"version":3,"file":"options.js","sources":["../../../src/runtimes/claude/options.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,0BAA0B,GAAG,yFAAyF,CAAC;AAEpI,MAAM,CAAC,MAAM,2BAA2B,GAA0B;IAChE,GAAG,CAAC,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,KAAK,EAAE,wEAAwE;IAC/E,uBAAuB,EAAE,4GAA4G;IACrI,mBAAmB,EAAE,6FAA6F;CACnH,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { UpdateChecker, UpgradeOptions, UpgradeResult } from "../../contracts/update.js";
|
|
1
|
+
import type { UpdateChecker, Upgrader } from "../../contracts/update.js";
|
|
3
2
|
/**
|
|
4
3
|
* Claude has no check-only command, so the check reads what `claude update`
|
|
5
4
|
* reads (claude 2.1.286): the native build follows
|
|
@@ -16,17 +15,26 @@ export interface ClaudeUpdateSources {
|
|
|
16
15
|
readonly configDir: () => string;
|
|
17
16
|
/** `.claude.json`, where claude records its `installMethod`. */
|
|
18
17
|
readonly globalConfig: () => string;
|
|
18
|
+
/** Read-only Linux system package owner check (`dpkg`/`rpm`/`apk`/`pacman`), bounded by `timeoutMs`. */
|
|
19
|
+
readonly systemPackageManager?: (realPath: string, timeoutMs: number) => Promise<string | null>;
|
|
19
20
|
}
|
|
20
|
-
|
|
21
|
+
/** Minimal environment for read-only Linux package-ownership probes (no host credentials). */
|
|
22
|
+
export declare function packageProbeEnv(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;
|
|
23
|
+
export type ClaudeInstallMethod = "native" | "npm" | "package_manager" | "unknown";
|
|
21
24
|
/**
|
|
22
|
-
* The layout decides where it is unambiguous
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
25
|
+
* The layout decides where it is unambiguous:
|
|
26
|
+
* - [env]/[sym] Claude 2.1.286/2.1.292: `/claude/versions/` is the native versions store.
|
|
27
|
+
* - [sym] Claude 2.1.292: `/.local/bin/claude.exe` is the Windows native launcher (copied, not symlinked).
|
|
28
|
+
* - [env]/[sym] Claude 2.1.286/2.1.292: `/node_modules/@anthropic-ai/claude-code/` is npm.
|
|
29
|
+
* - [sym] Claude 2.1.292: `PACKAGE_MANAGED` segments are Homebrew, mise, asdf and WinGet.
|
|
30
|
+
* - [env]/[sym] Claude 2.1.286/2.1.292: a shim whose path is ambiguous (pnpm bin, Windows `.cmd`)
|
|
31
|
+
* falls back to `recorded === "global"` for npm.
|
|
32
|
+
* Any other layout (such as `/usr/bin/claude` or a manually copied binary) stays `"unknown"`
|
|
33
|
+
* rather than guessing `"native"`.
|
|
26
34
|
*/
|
|
27
35
|
export declare function claudeInstallMethod(realPath: string, recorded?: unknown): ClaudeInstallMethod;
|
|
28
36
|
export declare function claudeUpdateCheck(from?: ClaudeUpdateSources): UpdateChecker;
|
|
29
37
|
export declare const claudeCheckUpdate: UpdateChecker;
|
|
30
|
-
export declare function
|
|
31
|
-
export
|
|
38
|
+
export declare function claudeUpgrader(from?: ClaudeUpdateSources): Upgrader;
|
|
39
|
+
export declare const claudeUpgrade: Upgrader;
|
|
32
40
|
//# sourceMappingURL=update.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sources":["../../../src/runtimes/claude/update.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"update.d.ts","sources":["../../../src/runtimes/claude/update.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAmC,aAAa,EAAkB,QAAQ,EAAiB,MAAM,2BAA2B,CAAC;AAczI;;;;;;;;;GASG;AACH,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,MAAM,CAAC;IACjC,gEAAgE;IAChE,QAAQ,CAAC,YAAY,EAAE,MAAM,MAAM,CAAC;IACpC,wGAAwG;IACxG,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CACjG;AA0BD,8FAA8F;AAC9F,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG,MAAM,CAAC,UAAU,CAKvF;AAwCD,MAAM,MAAM,mBAAmB,GAAG,QAAQ,GAAG,KAAK,GAAG,iBAAiB,GAAG,SAAS,CAAC;AAEnF;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,mBAAmB,CAY7F;AA4FD,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,mBAA6B,GAAG,aAAa,CAapF;AAED,eAAO,MAAM,iBAAiB,eAAsB,CAAC;AAErD,wBAAgB,cAAc,CAAC,IAAI,GAAE,mBAA6B,GAAG,QAAQ,CA0B5E;AAED,eAAO,MAAM,aAAa,UAAmB,CAAC"}
|
|
@@ -1,35 +1,118 @@
|
|
|
1
1
|
import { readFileSync } from "node:fs";
|
|
2
|
+
import { readFile } from "node:fs/promises";
|
|
2
3
|
import { homedir } from "node:os";
|
|
3
4
|
import path from "node:path";
|
|
5
|
+
import { runIsolated } from "../../shared/executable/index.js";
|
|
4
6
|
import { asRecord, parseJson } from "../../shared/json.js";
|
|
5
7
|
import { CHECK_TIMEOUT_MS, comparedCheck, executableUpdate, installedPath, readReleaseSource, upgradeExecutable, versionAtLeast, } from "../../shared/update.js";
|
|
6
8
|
import { claudeEnv } from "./environment.js";
|
|
9
|
+
const DESKTOP_CACHE = /\/Library\/Application Support\/Claude\/claude-code\/[^/]+\/[^/]+\/claude\.app\/Contents\/MacOS\/claude$/u;
|
|
10
|
+
const DESKTOP_OWNER = "Claude Desktop installs, verifies and updates this copy";
|
|
11
|
+
// [sym] Claude 2.1.292: on Windows, the native installer copies the binary to
|
|
12
|
+
// `%USERPROFILE%\.local\bin\claude.exe` instead of symlinking into `/claude/versions/`,
|
|
13
|
+
// and its native-installation path predicate accepts `<home>/.local/bin/claude.exe`.
|
|
14
|
+
// On POSIX, `~/.local/bin/claude` must be a symlink into `/claude/versions/` (Claude's
|
|
15
|
+
// updater refuses to replace a non-symlink file there), so only the `.exe` launcher matches.
|
|
16
|
+
const WINDOWS_NATIVE_LAUNCHER = /\/\.local\/bin\/claude\.exe$/iu;
|
|
17
|
+
// [sym] Claude 2.1.292 path-based package-manager detectors (Homebrew, mise, asdf, WinGet).
|
|
18
|
+
const PACKAGE_MANAGED = ["/Caskroom/", "/Cellar/", "/mise/", "/asdf/", "/WinGet/", "/winget/"];
|
|
19
|
+
// [sym] Claude 2.1.292 Linux system-package ownership probes (apt/dnf/apk/pacman
|
|
20
|
+
// install to standard FHS paths like `/usr/bin/claude`, so path matching alone cannot identify them).
|
|
21
|
+
const LINUX_PACKAGE_MANAGERS = [
|
|
22
|
+
{ name: "pacman", distros: ["arch"], command: "pacman", args: ["-Qo"] },
|
|
23
|
+
{ name: "apk", distros: ["alpine"], command: "apk", args: ["info", "--who-owns"] },
|
|
24
|
+
{ name: "dpkg", distros: ["debian"], command: "dpkg", args: ["-S"] },
|
|
25
|
+
{ name: "rpm", distros: ["fedora", "rhel", "suse"], command: "rpm", args: ["-qf"] },
|
|
26
|
+
];
|
|
27
|
+
const SYSTEM_PM_TIMEOUT_MS = 5000;
|
|
28
|
+
/** Minimal environment for read-only Linux package-ownership probes (no host credentials). */
|
|
29
|
+
export function packageProbeEnv(env = process.env) {
|
|
30
|
+
const minimal = { LC_ALL: "C" };
|
|
31
|
+
if (env.PATH !== undefined) {
|
|
32
|
+
minimal.PATH = env.PATH;
|
|
33
|
+
}
|
|
34
|
+
if (env.LANG !== undefined) {
|
|
35
|
+
minimal.LANG = env.LANG;
|
|
36
|
+
}
|
|
37
|
+
return minimal;
|
|
38
|
+
}
|
|
39
|
+
async function linuxOsIds() {
|
|
40
|
+
try {
|
|
41
|
+
const text = await readFile("/etc/os-release", "utf8");
|
|
42
|
+
const id = /^ID=["']?(\S+?)["']?\s*$/mu.exec(text)?.[1];
|
|
43
|
+
const like = /^ID_LIKE=["']?(.+?)["']?\s*$/mu.exec(text)?.[1]?.split(/\s+/u) ?? [];
|
|
44
|
+
return [id, ...like].filter((value) => value !== undefined && value.length > 0);
|
|
45
|
+
}
|
|
46
|
+
catch {
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
async function detectLinuxSystemPackageManager(realPath, timeoutMs) {
|
|
51
|
+
if (process.platform !== "linux" || timeoutMs <= 0) {
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
const deadline = Date.now() + timeoutMs;
|
|
55
|
+
const osIds = await linuxOsIds();
|
|
56
|
+
const env = packageProbeEnv();
|
|
57
|
+
for (const pm of LINUX_PACKAGE_MANAGERS) {
|
|
58
|
+
if (osIds !== null && !pm.distros.some((distro) => osIds.includes(distro))) {
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
const remaining = deadline - Date.now();
|
|
62
|
+
if (remaining <= 0) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
const probeTimeout = Math.min(SYSTEM_PM_TIMEOUT_MS, remaining);
|
|
66
|
+
// oxlint-disable-next-line no-await-in-loop -- ordered distro-filtered ownership lookup.
|
|
67
|
+
const result = await runIsolated(pm.command, [...pm.args, realPath], { env, timeoutMs: probeTimeout }).catch(() => null);
|
|
68
|
+
if (result !== null && result.exitCode === 0 && result.stdout.trim().length > 0) {
|
|
69
|
+
return pm.name;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return null;
|
|
73
|
+
}
|
|
7
74
|
const sources = {
|
|
8
75
|
releases: "https://downloads.claude.ai/claude-code-releases",
|
|
9
76
|
npm: "https://registry.npmjs.org/@anthropic-ai/claude-code",
|
|
10
77
|
configDir: () => process.env.CLAUDE_CONFIG_DIR ?? path.join(homedir(), ".claude"),
|
|
11
78
|
globalConfig: () => path.join(process.env.CLAUDE_CONFIG_DIR ?? homedir(), ".claude.json"),
|
|
79
|
+
systemPackageManager: detectLinuxSystemPackageManager,
|
|
12
80
|
};
|
|
13
|
-
const DESKTOP_CACHE = /\/Library\/Application Support\/Claude\/claude-code\/[^/]+\/[^/]+\/claude\.app\/Contents\/MacOS\/claude$/u;
|
|
14
|
-
const DESKTOP_OWNER = "Claude Desktop installs, verifies and updates this copy";
|
|
15
|
-
const PACKAGE_MANAGED = ["/Caskroom/", "/Cellar/", "/mise/", "/asdf/", "/WinGet/", "/winget/"];
|
|
16
81
|
/**
|
|
17
|
-
* The layout decides where it is unambiguous
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
82
|
+
* The layout decides where it is unambiguous:
|
|
83
|
+
* - [env]/[sym] Claude 2.1.286/2.1.292: `/claude/versions/` is the native versions store.
|
|
84
|
+
* - [sym] Claude 2.1.292: `/.local/bin/claude.exe` is the Windows native launcher (copied, not symlinked).
|
|
85
|
+
* - [env]/[sym] Claude 2.1.286/2.1.292: `/node_modules/@anthropic-ai/claude-code/` is npm.
|
|
86
|
+
* - [sym] Claude 2.1.292: `PACKAGE_MANAGED` segments are Homebrew, mise, asdf and WinGet.
|
|
87
|
+
* - [env]/[sym] Claude 2.1.286/2.1.292: a shim whose path is ambiguous (pnpm bin, Windows `.cmd`)
|
|
88
|
+
* falls back to `recorded === "global"` for npm.
|
|
89
|
+
* Any other layout (such as `/usr/bin/claude` or a manually copied binary) stays `"unknown"`
|
|
90
|
+
* rather than guessing `"native"`.
|
|
21
91
|
*/
|
|
22
92
|
export function claudeInstallMethod(realPath, recorded) {
|
|
23
|
-
|
|
93
|
+
const normalized = realPath.replaceAll("\\", "/");
|
|
94
|
+
if (normalized.includes("/claude/versions/") || WINDOWS_NATIVE_LAUNCHER.test(normalized)) {
|
|
24
95
|
return "native";
|
|
25
96
|
}
|
|
26
|
-
if (
|
|
97
|
+
if (normalized.includes("/node_modules/@anthropic-ai/claude-code/")) {
|
|
27
98
|
return "npm";
|
|
28
99
|
}
|
|
29
|
-
if (PACKAGE_MANAGED.some((segment) =>
|
|
100
|
+
if (PACKAGE_MANAGED.some((segment) => normalized.includes(segment))) {
|
|
30
101
|
return "package_manager";
|
|
31
102
|
}
|
|
32
|
-
return recorded === "global" ? "npm" : "
|
|
103
|
+
return recorded === "global" ? "npm" : "unknown";
|
|
104
|
+
}
|
|
105
|
+
async function resolveClaudeInstallMethod(realPath, from, timeoutMs) {
|
|
106
|
+
const byPath = claudeInstallMethod(realPath);
|
|
107
|
+
if (byPath !== "unknown") {
|
|
108
|
+
return { method: byPath };
|
|
109
|
+
}
|
|
110
|
+
const manager = await (from.systemPackageManager ?? detectLinuxSystemPackageManager)(realPath, timeoutMs);
|
|
111
|
+
if (manager !== null) {
|
|
112
|
+
return { method: "package_manager", manager };
|
|
113
|
+
}
|
|
114
|
+
const recorded = readJsonRecord(from.globalConfig()).installMethod;
|
|
115
|
+
return { method: claudeInstallMethod(realPath, recorded) };
|
|
33
116
|
}
|
|
34
117
|
function readJsonRecord(file) {
|
|
35
118
|
try {
|
|
@@ -58,6 +141,34 @@ async function npmCheck(installed, channel, source) {
|
|
|
58
141
|
const version = asRecord(parseJson(read.text))?.version;
|
|
59
142
|
return comparedCheck(installed, typeof version === "string" ? version : "", source.url, channel);
|
|
60
143
|
}
|
|
144
|
+
function unavailableForMethod(resolved) {
|
|
145
|
+
if (resolved.method === "package_manager") {
|
|
146
|
+
const owner = resolved.manager ?? "its package manager";
|
|
147
|
+
return { kind: "unavailable", reason: "package_manager", detail: `this copy updates through ${owner}` };
|
|
148
|
+
}
|
|
149
|
+
if (resolved.method === "unknown") {
|
|
150
|
+
return { kind: "unavailable", reason: "unmanaged_installation", detail: "Claude installation layout is not recognized" };
|
|
151
|
+
}
|
|
152
|
+
return null;
|
|
153
|
+
}
|
|
154
|
+
async function checkWithResolvedMethod(installed, resolved, from, deadline) {
|
|
155
|
+
const unavailable = unavailableForMethod(resolved);
|
|
156
|
+
if (unavailable !== null) {
|
|
157
|
+
return unavailable;
|
|
158
|
+
}
|
|
159
|
+
const settings = readJsonRecord(path.join(from.configDir(), "settings.json"));
|
|
160
|
+
if (updatesDisabled(settings)) {
|
|
161
|
+
return { kind: "unavailable", reason: "updates_disabled", detail: "DISABLE_UPDATES is set" };
|
|
162
|
+
}
|
|
163
|
+
const channel = settings.autoUpdatesChannel === "stable" ? "stable" : "latest";
|
|
164
|
+
const timeoutMs = Math.max(deadline - Date.now(), 1);
|
|
165
|
+
if (resolved.method === "npm") {
|
|
166
|
+
return withMinimum(await npmCheck(installed, channel, { url: `${from.npm}/${channel}`, timeoutMs }), settings.minimumVersion);
|
|
167
|
+
}
|
|
168
|
+
const url = `${from.releases}/${channel}`;
|
|
169
|
+
const read = await readReleaseSource(url, timeoutMs);
|
|
170
|
+
return read.ok ? withMinimum(comparedCheck(installed, read.text.trim(), url, channel), settings.minimumVersion) : read.check;
|
|
171
|
+
}
|
|
61
172
|
export function claudeUpdateCheck(from = sources) {
|
|
62
173
|
return async (installation, options = {}) => {
|
|
63
174
|
if (installation.via === "executable" && DESKTOP_CACHE.test(installedPath(installation.command))) {
|
|
@@ -67,32 +178,38 @@ export function claudeUpdateCheck(from = sources) {
|
|
|
67
178
|
if (update.kind === "unavailable") {
|
|
68
179
|
return update.check;
|
|
69
180
|
}
|
|
70
|
-
const
|
|
71
|
-
const
|
|
72
|
-
|
|
73
|
-
|
|
181
|
+
const deadline = Date.now() + (options.timeoutMs ?? CHECK_TIMEOUT_MS);
|
|
182
|
+
const resolved = await resolveClaudeInstallMethod(installedPath(update.installation.command), from, Math.max(deadline - Date.now(), 0));
|
|
183
|
+
return checkWithResolvedMethod(update.installed, resolved, from, deadline);
|
|
184
|
+
};
|
|
185
|
+
}
|
|
186
|
+
export const claudeCheckUpdate = claudeUpdateCheck();
|
|
187
|
+
export function claudeUpgrader(from = sources) {
|
|
188
|
+
return async (installation, options) => {
|
|
189
|
+
if (installation.via !== "executable") {
|
|
190
|
+
return upgradeExecutable(installation, { check: claudeUpdateCheck(from), args: ["update"], env: claudeEnv }, options);
|
|
74
191
|
}
|
|
75
|
-
const
|
|
76
|
-
if (
|
|
77
|
-
return { kind: "
|
|
192
|
+
const realPath = installedPath(installation.command);
|
|
193
|
+
if (DESKTOP_CACHE.test(realPath)) {
|
|
194
|
+
return { kind: "unsupported", reason: "unsupported_installation", detail: DESKTOP_OWNER };
|
|
78
195
|
}
|
|
79
|
-
const
|
|
80
|
-
const
|
|
81
|
-
|
|
82
|
-
|
|
196
|
+
const deadline = Date.now() + (options?.timeoutMs ?? CHECK_TIMEOUT_MS);
|
|
197
|
+
const resolved = await resolveClaudeInstallMethod(realPath, from, Math.max(deadline - Date.now(), 0));
|
|
198
|
+
const unavailable = unavailableForMethod(resolved);
|
|
199
|
+
if (unavailable !== null && unavailable.kind === "unavailable") {
|
|
200
|
+
return { kind: "unsupported", reason: "unsupported_installation", ...(unavailable.detail === undefined ? {} : { detail: unavailable.detail }) };
|
|
83
201
|
}
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
|
|
202
|
+
const check = async (current) => {
|
|
203
|
+
const update = executableUpdate(current);
|
|
204
|
+
if (update.kind === "unavailable") {
|
|
205
|
+
return update.check;
|
|
206
|
+
}
|
|
207
|
+
const checked = await checkWithResolvedMethod(update.installed, resolved, from, deadline);
|
|
208
|
+
return checked;
|
|
209
|
+
};
|
|
210
|
+
// Without the parent Claude Code session's markers, as every other claude OAR starts (environment.ts).
|
|
211
|
+
return upgradeExecutable(installation, { check, args: ["update"], env: claudeEnv }, options);
|
|
87
212
|
};
|
|
88
213
|
}
|
|
89
|
-
export const
|
|
90
|
-
export async function claudeUpgrade(installation, options) {
|
|
91
|
-
if (installation.via === "executable" && DESKTOP_CACHE.test(installedPath(installation.command))) {
|
|
92
|
-
return { kind: "unsupported", reason: "unsupported_installation", detail: DESKTOP_OWNER };
|
|
93
|
-
}
|
|
94
|
-
// Without the parent Claude Code session's markers, as every other claude OAR starts (environment.ts).
|
|
95
|
-
const result = await upgradeExecutable(installation, { check: claudeCheckUpdate, args: ["update"], env: claudeEnv }, options);
|
|
96
|
-
return result;
|
|
97
|
-
}
|
|
214
|
+
export const claudeUpgrade = claudeUpgrader();
|
|
98
215
|
//# sourceMappingURL=update.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sources":["../../../src/runtimes/claude/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,cAAc,GACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"update.js","sources":["../../../src/runtimes/claude/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,7 @@ export function claudeUserConfiguration(options) {
|
|
|
77
77
|
const args = [...(settings ? ["--setting-sources", "project,local"] : []), ...(mcp ? ["--strict-mcp-config"] : [])];
|
|
78
78
|
for (const arg of options.launchArgs ?? []) {
|
|
79
79
|
const flag = arg.split("=", 1)[0] ?? arg;
|
|
80
|
-
if ((settings && flag === "--setting-sources") || (mcp && flag === "--strict-mcp-config")
|
|
80
|
+
if ((settings && flag === "--setting-sources") || (mcp && flag === "--strict-mcp-config")) {
|
|
81
81
|
throw new UnsupportedOptionError("launchArgs", `claude launchArgs cannot include ${flag} with userConfiguration: exclude; OAR manages the exclusion settings`);
|
|
82
82
|
}
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-configuration.js","sources":["../../../src/runtimes/claude/user-configuration.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"user-configuration.js","sources":["../../../src/runtimes/claude/user-configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-server-client.d.ts","sources":["../../../src/runtimes/codex/app-server-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAoB,KAAK,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;
|
|
1
|
+
{"version":3,"file":"app-server-client.d.ts","sources":["../../../src/runtimes/codex/app-server-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { sessionEnvironment } from "../../shared/environment.js";
|
|
2
2
|
import { spawnLineProcess } from "../../shared/executable/index.js";
|
|
3
|
-
import {
|
|
4
|
-
import { processFailure } from "../../shared/executable/diagnostics.js";
|
|
3
|
+
import { reportedProcessFailure, sessionExitReason } from "../../shared/executable/reported-stderr.js";
|
|
5
4
|
import { asRecord, parseJson } from "../../shared/json.js";
|
|
6
5
|
import { nativeErrorCause } from "../../shared/native-error.js";
|
|
7
6
|
import { coordinateHomeInitialization } from "./home-initialization.js";
|
|
@@ -85,12 +84,7 @@ function createAppServerClient(command, env, configOverrides, cwd, processOption
|
|
|
85
84
|
}
|
|
86
85
|
});
|
|
87
86
|
child.onExit(() => {
|
|
88
|
-
|
|
89
|
-
exitFailure = processFailure("app-server exited", {
|
|
90
|
-
...diagnostics,
|
|
91
|
-
stderr: reportedStderr(diagnostics, redact),
|
|
92
|
-
...(diagnostics.error === undefined ? {} : { error: { ...diagnostics.error, message: redact(diagnostics.error.message) } }),
|
|
93
|
-
});
|
|
87
|
+
exitFailure = reportedProcessFailure("app-server exited", child.diagnostics(), redact);
|
|
94
88
|
for (const waiter of pending.values()) {
|
|
95
89
|
const error = exitFailure;
|
|
96
90
|
waiter.settled({ kind: "exited", error });
|
|
@@ -143,7 +137,7 @@ function createAppServerClient(command, env, configOverrides, cwd, processOption
|
|
|
143
137
|
});
|
|
144
138
|
},
|
|
145
139
|
onExit(handler) {
|
|
146
|
-
child.onExit(handler);
|
|
140
|
+
child.onExit((code, reason) => { handler(code, sessionExitReason(child, reason, redact)); });
|
|
147
141
|
},
|
|
148
142
|
kill() {
|
|
149
143
|
child.kill();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-server-client.js","sources":["../../../src/runtimes/codex/app-server-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAA2B,MAAM,kCAAkC,CAAC;AAC7F,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"app-server-client.js","sources":["../../../src/runtimes/codex/app-server-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { SessionOptions } from "../../contracts/session.js";
|
|
2
|
+
import { type JsonRecord } from "../../shared/json.js";
|
|
3
|
+
import type { AppServerClient } from "./app-server-client.js";
|
|
4
|
+
/** Resolve both options against the same native configuration for this open's cwd. */
|
|
5
|
+
export declare function prepareCodexOpenParams(client: AppServerClient, options: SessionOptions, params: JsonRecord): Promise<JsonRecord>;
|
|
6
|
+
//# sourceMappingURL=open-config.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-config.d.ts","sources":["../../../src/runtimes/codex/open-config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AACjE,OAAO,EAAY,KAAK,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAG9D,sFAAsF;AACtF,wBAAsB,sBAAsB,CAAC,MAAM,EAAE,eAAe,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,CAatI"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { asRecord } from "../../shared/json.js";
|
|
2
|
+
import { codexToolDenialsConfig, withCodexToolDenials } from "./tool-denials.js";
|
|
3
|
+
/** Resolve both options against the same native configuration for this open's cwd. */
|
|
4
|
+
export async function prepareCodexOpenParams(client, options, params) {
|
|
5
|
+
const append = options.appendSystemPrompt;
|
|
6
|
+
const filterTools = (options.disallowedTools?.length ?? 0) > 0;
|
|
7
|
+
if (append === undefined && !filterTools) {
|
|
8
|
+
return params;
|
|
9
|
+
}
|
|
10
|
+
const reply = await client.request("config/read", { cwd: options.cwd, includeLayers: false });
|
|
11
|
+
const config = asRecord(reply.config);
|
|
12
|
+
const filtered = filterTools ? withCodexToolDenials(params, codexToolDenialsConfig(options, config ?? {})) : params;
|
|
13
|
+
if (append === undefined) {
|
|
14
|
+
return filtered;
|
|
15
|
+
}
|
|
16
|
+
if (config === null) {
|
|
17
|
+
throw new Error("codex config/read returned no effective configuration for appendSystemPrompt");
|
|
18
|
+
}
|
|
19
|
+
const configured = config.developer_instructions;
|
|
20
|
+
if (configured === null || configured === undefined || configured === "") {
|
|
21
|
+
return filtered;
|
|
22
|
+
}
|
|
23
|
+
if (typeof configured !== "string") {
|
|
24
|
+
throw new TypeError("codex config/read returned non-text developer_instructions");
|
|
25
|
+
}
|
|
26
|
+
return { ...filtered, developerInstructions: append === "" ? configured : `${configured}\n\n${append}` };
|
|
27
|
+
}
|
|
28
|
+
//# sourceMappingURL=open-config.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"open-config.js","sources":["../../../src/runtimes/codex/open-config.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAmB,MAAM,sBAAsB,CAAC;AAEjE,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEjF,sFAAsF;AACtF,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAAC,MAAuB,EAAE,OAAuB,EAAE,MAAkB;IAC/G,MAAM,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAC1C,MAAM,WAAW,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IAC/D,IAAI,MAAM,KAAK,SAAS,IAAI,CAAC,WAAW,EAAE,CAAC;QAAC,OAAO,MAAM,CAAC;IAAC,CAAC;IAC5D,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC9F,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,MAAM,EAAE,sBAAsB,CAAC,OAAO,EAAE,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACpH,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAAC,OAAO,QAAQ,CAAC;IAAC,CAAC;IAC9C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAAC,MAAM,IAAI,KAAK,CAAC,8EAA8E,CAAC,CAAC;IAAC,CAAC;IACzH,MAAM,UAAU,GAAG,MAAM,CAAC,sBAAsB,CAAC;IACjD,IAAI,UAAU,KAAK,IAAI,IAAI,UAAU,KAAK,SAAS,IAAI,UAAU,KAAK,EAAE,EAAE,CAAC;QAAC,OAAO,QAAQ,CAAC;IAAC,CAAC;IAC9F,IAAI,OAAO,UAAU,KAAK,QAAQ,EAAE,CAAC;QAAC,MAAM,IAAI,SAAS,CAAC,4DAA4D,CAAC,CAAC;IAAC,CAAC;IAC1H,OAAO,EAAE,GAAG,QAAQ,EAAE,qBAAqB,EAAE,MAAM,KAAK,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,OAAO,MAAM,EAAE,EAAE,CAAC;AAC3G,CAAC"}
|
|
@@ -14,7 +14,7 @@ import { newSessionLinks } from "../../shared/session-links.js";
|
|
|
14
14
|
import { startAppServerClient } from "./app-server-client.js";
|
|
15
15
|
import { CODEX_SETTINGS_REPORT_MS, codexOpenReadback, codexResumeEffortRefusal, codexThreadName, codexThreadOpen } from "./open.js";
|
|
16
16
|
import { foldCodexNotification, initialCodexProjection } from "./projection.js";
|
|
17
|
-
import {
|
|
17
|
+
import { prepareCodexOpenParams } from "./open-config.js";
|
|
18
18
|
import { missingDirectoryError, nameThread, openThread, rpcControl, updateThreadEffort } from "./rpc-control.js";
|
|
19
19
|
import { codexControlRefusal, codexVersion } from "./refusal.js";
|
|
20
20
|
import { codexServerRequests } from "./runtime-requests.js";
|
|
@@ -48,7 +48,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
48
48
|
if (options.goals === true) {
|
|
49
49
|
await confirmCodexGoals(client);
|
|
50
50
|
}
|
|
51
|
-
const
|
|
51
|
+
const effectiveOpenParams = await prepareCodexOpenParams(client, options, openParams);
|
|
52
52
|
// The open event is marked at the reply's wire position AS the reply line
|
|
53
53
|
// is read (onSettled → client.mark), not after this await: a frame codex
|
|
54
54
|
// wrote in the same chunk right after the reply (thread/started) would
|
|
@@ -61,7 +61,7 @@ export const codexSession = withSessionCredentials(async (installation, options,
|
|
|
61
61
|
}
|
|
62
62
|
};
|
|
63
63
|
const started = await openThread(openMethod, async () => {
|
|
64
|
-
const reply = await client.request(openMethod,
|
|
64
|
+
const reply = await client.request(openMethod, effectiveOpenParams, markOpen);
|
|
65
65
|
return reply;
|
|
66
66
|
}, { version, serviceTier: options.serviceTier, resumeId: options.resume, through: options.fork?.through });
|
|
67
67
|
const threadId = asRecord(started.thread)?.id;
|