typeclaw 0.48.12 → 0.49.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/package.json +6 -3
- package/scripts/dump-system-prompt.ts +52 -110
- package/src/agent/attention-escalation.ts +8 -5
- package/src/agent/auth-reloadable.ts +2 -3
- package/src/agent/auth.ts +59 -79
- package/src/agent/compaction.ts +2 -2
- package/src/agent/index.ts +173 -85
- package/src/agent/live-sessions.ts +2 -2
- package/src/agent/live-subagents.ts +1 -0
- package/src/agent/llm-replay-sanitizer.ts +1 -1
- package/src/agent/model-overrides.ts +1 -1
- package/src/agent/multimodal/look-at.ts +3 -3
- package/src/agent/multimodal/read-redirect.ts +1 -1
- package/src/agent/plugin-tools.ts +76 -39
- package/src/agent/prompt-cache-key.ts +42 -0
- package/src/agent/provider-error.ts +179 -10
- package/src/agent/reload-tool.ts +1 -1
- package/src/agent/restart-handoff/index.ts +7 -14
- package/src/agent/reviewer-activity.ts +68 -0
- package/src/agent/session-origin.ts +33 -0
- package/src/agent/subagents.ts +14 -2
- package/src/agent/system-prompt.ts +68 -202
- package/src/agent/todo/continuation-policy.ts +12 -4
- package/src/agent/tool-error-remediation.ts +1 -1
- package/src/agent/tool-file-safety.ts +113 -14
- package/src/agent/tool-not-found-nudge.ts +1 -1
- package/src/agent/tool-result-budget.ts +2 -2
- package/src/agent/tools/channel-disengage.ts +2 -2
- package/src/agent/tools/channel-edit.ts +2 -2
- package/src/agent/tools/channel-fetch-attachment.ts +2 -2
- package/src/agent/tools/channel-history-render.ts +2 -1
- package/src/agent/tools/channel-history.ts +2 -2
- package/src/agent/tools/channel-react.ts +2 -2
- package/src/agent/tools/channel-read.ts +2 -2
- package/src/agent/tools/channel-reply.ts +25 -7
- package/src/agent/tools/channel-send.ts +51 -9
- package/src/agent/tools/curl-impersonate.ts +11 -2
- package/src/agent/tools/grant-role.ts +2 -2
- package/src/agent/tools/post-github-review.ts +79 -17
- package/src/agent/tools/restart.ts +2 -2
- package/src/agent/tools/skip-response.ts +4 -4
- package/src/agent/tools/spawn-subagent.ts +165 -14
- package/src/agent/tools/stream-snapshot.ts +2 -2
- package/src/agent/tools/subagent-cancel.ts +2 -2
- package/src/agent/tools/subagent-output.ts +10 -2
- package/src/agent/tools/todo/index.ts +2 -2
- package/src/agent/tools/webfetch/tool.ts +2 -2
- package/src/agent/tools/websearch.ts +2 -2
- package/src/bundled-plugins/backup/README.md +10 -9
- package/src/bundled-plugins/backup/runner.ts +140 -58
- package/src/bundled-plugins/backup/subagents.ts +58 -26
- package/src/bundled-plugins/github-cli-auth/gh-command.ts +34 -2
- package/src/bundled-plugins/github-cli-auth/granted-push.ts +135 -0
- package/src/bundled-plugins/github-cli-auth/index.ts +83 -11
- package/src/bundled-plugins/github-cli-auth/review-account.ts +23 -0
- package/src/bundled-plugins/github-cli-auth/review-checkout.ts +9 -2
- package/src/bundled-plugins/github-cli-auth/review-recorder.ts +45 -7
- package/src/bundled-plugins/operator/operator.ts +15 -4
- package/src/bundled-plugins/reviewer/skills/code-review.ts +1 -1
- package/src/bundled-plugins/security/index.ts +50 -2
- package/src/bundled-plugins/security/policies/git-exfil.ts +24 -12
- package/src/channels/adapters/discord-bot-reactions.ts +18 -0
- package/src/channels/adapters/discord-bot.ts +122 -67
- package/src/channels/adapters/discord-reactions.ts +18 -0
- package/src/channels/adapters/discord.ts +114 -8
- package/src/channels/adapters/github/inbound.ts +103 -8
- package/src/channels/adapters/github/index.ts +251 -19
- package/src/channels/adapters/github/last-alive.ts +27 -0
- package/src/channels/adapters/github/outbound.ts +54 -18
- package/src/channels/adapters/github/pending-review-store.ts +141 -0
- package/src/channels/adapters/github/permission-guidance.ts +1 -0
- package/src/channels/adapters/github/reactions.ts +100 -0
- package/src/channels/adapters/github/reconcile-cooldown-store.ts +197 -67
- package/src/channels/adapters/github/reconcile-open-prs.ts +418 -33
- package/src/channels/adapters/github/recovery.ts +106 -0
- package/src/channels/adapters/github/review-check.ts +510 -0
- package/src/channels/adapters/github/review-submitter.ts +34 -2
- package/src/channels/adapters/instagram.ts +32 -14
- package/src/channels/adapters/kakaotalk.ts +22 -7
- package/src/channels/adapters/line.ts +18 -3
- package/src/channels/adapters/outbound-account.ts +20 -0
- package/src/channels/adapters/own-reactions.ts +66 -0
- package/src/channels/adapters/recovery-correlation.ts +214 -0
- package/src/channels/adapters/slack-bot-classify.ts +18 -11
- package/src/channels/adapters/slack-bot-dedupe.ts +111 -28
- package/src/channels/adapters/slack-bot-reactions.ts +18 -0
- package/src/channels/adapters/slack-bot.ts +125 -57
- package/src/channels/adapters/slack-classify.ts +25 -4
- package/src/channels/adapters/slack-inbound-revision.ts +96 -0
- package/src/channels/adapters/slack-reactions.ts +18 -0
- package/src/channels/adapters/slack-thread-ts.ts +6 -0
- package/src/channels/adapters/slack.ts +48 -3
- package/src/channels/adapters/teams.ts +14 -4
- package/src/channels/adapters/telegram-bot.ts +56 -10
- package/src/channels/adapters/webex-bot.ts +12 -2
- package/src/channels/adapters/webex.ts +12 -2
- package/src/channels/background-handoff.ts +434 -0
- package/src/channels/background-obligations.ts +893 -0
- package/src/channels/continuity-types.ts +271 -0
- package/src/channels/github-review-check.ts +598 -0
- package/src/channels/github-review-turn-ledger.ts +102 -28
- package/src/channels/github-review-verdict-coordinator.ts +96 -13
- package/src/channels/github-token-bridge.ts +11 -5
- package/src/channels/inbound-journal.ts +1738 -0
- package/src/channels/index.ts +6 -1
- package/src/channels/manager.ts +17 -7
- package/src/channels/recovery-dispatcher.ts +264 -0
- package/src/channels/recovery-notice.ts +94 -0
- package/src/channels/recovery-outbox.ts +459 -0
- package/src/channels/router.ts +2582 -633
- package/src/channels/schema.ts +8 -1
- package/src/channels/subagent-completion-bridge.ts +17 -14
- package/src/channels/types.ts +121 -16
- package/src/channels/waiting-reactions.ts +664 -0
- package/src/cli/compose.ts +7 -4
- package/src/cli/hostd.ts +49 -3
- package/src/cli/inspect.ts +11 -14
- package/src/cli/model.ts +7 -5
- package/src/cli/oauth-callbacks.ts +38 -23
- package/src/coding-agent/broker-body.ts +38 -0
- package/src/coding-agent/broker.ts +290 -0
- package/src/coding-agent/claude.ts +95 -0
- package/src/coding-agent/codex.ts +104 -0
- package/src/coding-agent/index.ts +506 -0
- package/src/coding-agent/omo-state.ts +69 -0
- package/src/coding-agent/omo-stream.ts +98 -0
- package/src/coding-agent/omo.ts +192 -0
- package/src/coding-agent/runner.ts +263 -0
- package/src/coding-agent/tool.ts +62 -0
- package/src/coding-agent/worktree.ts +355 -0
- package/src/compose/restart.ts +10 -3
- package/src/compose/start.ts +20 -3
- package/src/config/config.ts +70 -26
- package/src/config/providers.ts +278 -50
- package/src/container/exit-reason.ts +44 -0
- package/src/container/index.ts +5 -0
- package/src/container/log-archive.ts +51 -13
- package/src/container/memory-limit.ts +1 -1
- package/src/container/memory-oversubscription.ts +36 -6
- package/src/container/oom-events.ts +86 -0
- package/src/container/restart.ts +2 -0
- package/src/container/shared.ts +8 -1
- package/src/container/start.ts +25 -13
- package/src/container/stop.ts +6 -2
- package/src/container/tool-oom-priority.ts +32 -0
- package/src/cron/consumer.ts +10 -4
- package/src/cron/reloadable.ts +23 -2
- package/src/doctor/checks.ts +14 -2
- package/src/hostd/daemon.ts +20 -10
- package/src/hostd/spawn.ts +106 -5
- package/src/hostd/version.ts +20 -0
- package/src/hostd/watchdog.ts +241 -0
- package/src/init/dockerfile.ts +57 -592
- package/src/init/index.ts +6 -7
- package/src/init/oauth-login.ts +57 -17
- package/src/inspect/transcript-view.ts +6 -3
- package/src/mcp/client.ts +3 -1
- package/src/operations/classify-tool-outcome.ts +45 -1
- package/src/operations/incidents.ts +10 -5
- package/src/plugin/core-tool-names.ts +1 -1
- package/src/plugin/define.ts +1 -0
- package/src/plugin/index.ts +1 -0
- package/src/plugin/types.ts +6 -1
- package/src/run/background-handoff-boot.ts +86 -0
- package/src/run/channel-session-factory.ts +5 -4
- package/src/run/index.ts +93 -93
- package/src/run/resource-sample.ts +19 -0
- package/src/sandbox/build.ts +4 -0
- package/src/sandbox/coding-agent.ts +214 -0
- package/src/sandbox/policy.ts +1 -0
- package/src/sandbox/runtime-private.ts +4 -1
- package/src/secrets/coding-agent-auth.ts +97 -0
- package/src/secrets/index.ts +0 -16
- package/src/secrets/refresh-provider-oauth.ts +30 -76
- package/src/secrets/schema.ts +3 -4
- package/src/secrets/storage.ts +133 -234
- package/src/server/command-runner.ts +6 -2
- package/src/server/index.ts +102 -41
- package/src/sessions/index.ts +1 -1
- package/src/skills/typeclaw-channel-github/SKILL.md +7 -5
- package/src/skills/typeclaw-claude-code/SKILL.md +25 -260
- package/src/skills/typeclaw-claude-code/references/auth-flow.md +7 -23
- package/src/skills/typeclaw-claude-code/references/headless-sessions.md +11 -0
- package/src/skills/typeclaw-claude-code/references/results-and-worktrees.md +13 -0
- package/src/skills/typeclaw-codex-cli/SKILL.md +35 -270
- package/src/skills/typeclaw-codex-cli/references/auth-flow.md +13 -20
- package/src/skills/typeclaw-codex-cli/references/headless-sessions.md +26 -0
- package/src/skills/typeclaw-codex-cli/references/results-and-worktrees.md +28 -0
- package/src/skills/typeclaw-config/SKILL.md +24 -24
- package/src/skills/typeclaw-config/references/dockerfile.md +14 -13
- package/src/skills/typeclaw-cron/SKILL.md +1 -1
- package/src/skills/typeclaw-github-contributing/SKILL.md +2 -2
- package/src/skills/typeclaw-memory/SKILL.md +3 -3
- package/src/skills/typeclaw-omo-cli/SKILL.md +52 -0
- package/src/skills/typeclaw-omo-cli/references/auth-flow.md +11 -0
- package/src/skills/typeclaw-omo-cli/references/headless-sessions.md +11 -0
- package/src/skills/typeclaw-omo-cli/references/results-and-worktrees.md +23 -0
- package/src/skills/typeclaw-plugins/SKILL.md +20 -20
- package/src/skills/typeclaw-skills/SKILL.md +19 -2
- package/src/skills/typeclaw-troubleshooting/SKILL.md +15 -2
- package/src/tui/index.ts +5 -3
- package/src/tui/theme.ts +1 -1
- package/typeclaw.schema.json +44 -2
- package/src/agent/adaptive-thinking-compat.ts +0 -79
- package/src/secrets/claude-credentials-json.ts +0 -129
- package/src/secrets/codex-auth-json.ts +0 -102
- package/src/secrets/export-claude-credentials-file.ts +0 -270
- package/src/secrets/export-codex-auth-file.ts +0 -250
- package/src/secrets/oauth-xai.ts +0 -348
- package/src/skills/typeclaw-claude-code/references/stop-hook.md +0 -101
- package/src/skills/typeclaw-claude-code/references/tmux-driving.md +0 -243
- package/src/skills/typeclaw-codex-cli/references/stop-hook.md +0 -92
- package/src/skills/typeclaw-codex-cli/references/tmux-driving.md +0 -239
|
@@ -0,0 +1,355 @@
|
|
|
1
|
+
import { spawn } from 'node:child_process'
|
|
2
|
+
import { once } from 'node:events'
|
|
3
|
+
import { constants } from 'node:fs'
|
|
4
|
+
import { lstat, mkdir, open, realpath, rename, rm } from 'node:fs/promises'
|
|
5
|
+
import { dirname, join, resolve } from 'node:path'
|
|
6
|
+
|
|
7
|
+
import { createAndOpenAnchoredDirectory, writeFileAnchored } from '@/agent/tool-file-safety'
|
|
8
|
+
import {
|
|
9
|
+
codingSourceMaskDirs,
|
|
10
|
+
CODING_MASK_FILES,
|
|
11
|
+
CODING_SOURCE,
|
|
12
|
+
assertCodingDirectory,
|
|
13
|
+
prepareCodingCommand,
|
|
14
|
+
} from '@/sandbox/coding-agent'
|
|
15
|
+
import { DEFAULT_SANDBOX_ENV } from '@/sandbox/policy'
|
|
16
|
+
|
|
17
|
+
export type CodingExecutor = (argv: readonly string[], cwd: string, env?: Record<string, string>) => Promise<string>
|
|
18
|
+
export type CodingWorkspace = {
|
|
19
|
+
readonly source: string
|
|
20
|
+
readonly taskRoot: string
|
|
21
|
+
readonly baseSha: string
|
|
22
|
+
readonly sourceIdentity: string
|
|
23
|
+
}
|
|
24
|
+
export type ChangeArtifacts = {
|
|
25
|
+
readonly changedFiles: readonly string[]
|
|
26
|
+
readonly untrackedFiles: readonly string[]
|
|
27
|
+
readonly patchPath: string
|
|
28
|
+
readonly oversized: boolean
|
|
29
|
+
}
|
|
30
|
+
const MAX_ARTIFACT = 64 * 1024 * 1024
|
|
31
|
+
|
|
32
|
+
// This executor is constructed by the trusted service, never supplied by a model.
|
|
33
|
+
export function codingGitExecutor(
|
|
34
|
+
source: string,
|
|
35
|
+
taskRoot: string,
|
|
36
|
+
signal?: AbortSignal,
|
|
37
|
+
mode: 'code' | 'plan' | 'snapshot' = 'code',
|
|
38
|
+
): CodingExecutor {
|
|
39
|
+
return async (argv, cwd, env) => {
|
|
40
|
+
const prepared = await prepareCodingCommand(argv, {
|
|
41
|
+
source,
|
|
42
|
+
taskRoot,
|
|
43
|
+
mode,
|
|
44
|
+
cwd,
|
|
45
|
+
env: {
|
|
46
|
+
GIT_CONFIG_NOSYSTEM: '1',
|
|
47
|
+
GIT_CONFIG_GLOBAL: '/dev/null',
|
|
48
|
+
GIT_TERMINAL_PROMPT: '0',
|
|
49
|
+
GIT_OPTIONAL_LOCKS: '0',
|
|
50
|
+
...env,
|
|
51
|
+
},
|
|
52
|
+
})
|
|
53
|
+
try {
|
|
54
|
+
return await runCodingProcess(
|
|
55
|
+
['bash', '-c', `exec ${prepared.commandString}`],
|
|
56
|
+
cwd,
|
|
57
|
+
prepared.spawnEnv,
|
|
58
|
+
signal,
|
|
59
|
+
prepared.extraFiles,
|
|
60
|
+
)
|
|
61
|
+
} finally {
|
|
62
|
+
await prepared.cleanup()
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
export async function runCodingProcess(
|
|
68
|
+
argv: readonly string[],
|
|
69
|
+
cwd: string,
|
|
70
|
+
env: Record<string, string> = DEFAULT_SANDBOX_ENV,
|
|
71
|
+
signal?: AbortSignal,
|
|
72
|
+
extraFiles: Array<number | 'ignore'> = [],
|
|
73
|
+
): Promise<string> {
|
|
74
|
+
signal = signal ? AbortSignal.any([signal, AbortSignal.timeout(60_000)]) : AbortSignal.timeout(60_000)
|
|
75
|
+
const [program, ...args] = argv
|
|
76
|
+
if (!program) throw new Error('Empty Git command.')
|
|
77
|
+
const child = spawn(program, args, { cwd, env, detached: true, stdio: ['ignore', 'pipe', 'pipe', ...extraFiles] })
|
|
78
|
+
const exited = once(child, 'close')
|
|
79
|
+
const cancel = () => {
|
|
80
|
+
if (child.pid === undefined) return
|
|
81
|
+
try {
|
|
82
|
+
process.kill(-child.pid, 'SIGKILL')
|
|
83
|
+
} catch (error) {
|
|
84
|
+
if (!(error instanceof Error && 'code' in error && error.code === 'ESRCH')) throw error
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
signal?.addEventListener('abort', cancel, { once: true })
|
|
88
|
+
if (signal?.aborted) cancel()
|
|
89
|
+
const consume = async (stream: NodeJS.ReadableStream): Promise<string> => {
|
|
90
|
+
const chunks: Uint8Array[] = []
|
|
91
|
+
let size = 0
|
|
92
|
+
for await (const value of stream) {
|
|
93
|
+
const bytes = Buffer.isBuffer(value) ? value : Buffer.from(value)
|
|
94
|
+
size += bytes.byteLength
|
|
95
|
+
if (size > MAX_ARTIFACT) {
|
|
96
|
+
cancel()
|
|
97
|
+
throw new Error('Coding artifact exceeds 64 MiB; partial work is preserved.')
|
|
98
|
+
}
|
|
99
|
+
chunks.push(bytes)
|
|
100
|
+
}
|
|
101
|
+
return Buffer.concat(chunks).toString('utf8')
|
|
102
|
+
}
|
|
103
|
+
if (!child.stdout || !child.stderr) throw new Error('Git pipes unavailable.')
|
|
104
|
+
const reads = [consume(child.stdout), consume(child.stderr)]
|
|
105
|
+
try {
|
|
106
|
+
const [output, , exit] = await Promise.all([...reads, exited])
|
|
107
|
+
if (!Array.isArray(exit) || exit[0] !== 0)
|
|
108
|
+
throw new Error('Sandboxed Git operation failed; source or task Git state may be unsupported.')
|
|
109
|
+
if (typeof output !== 'string') throw new Error('Git output unavailable.')
|
|
110
|
+
return output
|
|
111
|
+
} finally {
|
|
112
|
+
signal?.removeEventListener('abort', cancel)
|
|
113
|
+
cancel()
|
|
114
|
+
await Promise.allSettled([exited, ...reads])
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
export async function createCodingWorkspace(
|
|
119
|
+
source: string,
|
|
120
|
+
taskRoot: string,
|
|
121
|
+
execute: CodingExecutor,
|
|
122
|
+
sourcePath = CODING_SOURCE,
|
|
123
|
+
): Promise<CodingWorkspace> {
|
|
124
|
+
await assertCodingDirectory(source)
|
|
125
|
+
await assertCodingDirectory(taskRoot)
|
|
126
|
+
const identity = await lstat(source)
|
|
127
|
+
const git = (...args: string[]) =>
|
|
128
|
+
execute(['git', '--no-replace-objects', '-c', 'core.hooksPath=/dev/null', ...args], taskRoot)
|
|
129
|
+
const root = (await git('-C', sourcePath, 'rev-parse', '--show-toplevel')).trim()
|
|
130
|
+
if (root !== sourcePath) throw new Error('Select a repository root, not a subdirectory.')
|
|
131
|
+
const baseSha = (await git('-C', sourcePath, 'rev-parse', '--verify', 'HEAD^{commit}')).trim()
|
|
132
|
+
if (!/^[a-f0-9]{40,64}$/.test(baseSha)) throw new Error('Source has no committed HEAD.')
|
|
133
|
+
const tree = (await git('-C', sourcePath, 'ls-tree', '-rz', '--name-only', baseSha)).split('\0').filter(Boolean)
|
|
134
|
+
const protectedPath = tree.find(
|
|
135
|
+
(name) =>
|
|
136
|
+
CODING_MASK_FILES.some((file) => name === file) ||
|
|
137
|
+
codingSourceMaskDirs(source, taskRoot).some((dir) => name === dir || name.startsWith(`${dir}/`)),
|
|
138
|
+
)
|
|
139
|
+
if (protectedPath)
|
|
140
|
+
throw new Error(
|
|
141
|
+
'Selected source revision contains a protected canonical/private path. Select a clean committed revision.',
|
|
142
|
+
)
|
|
143
|
+
await git('init', '--bare', join(taskRoot, 'git'))
|
|
144
|
+
// file transport copies objects and --depth=1 excludes unrelated history.
|
|
145
|
+
await git(
|
|
146
|
+
'--git-dir',
|
|
147
|
+
join(taskRoot, 'git'),
|
|
148
|
+
'-c',
|
|
149
|
+
'protocol.file.allow=always',
|
|
150
|
+
'fetch',
|
|
151
|
+
'--depth=1',
|
|
152
|
+
'--no-tags',
|
|
153
|
+
`file://${sourcePath}`,
|
|
154
|
+
baseSha,
|
|
155
|
+
)
|
|
156
|
+
await git('--git-dir', join(taskRoot, 'git'), 'worktree', 'add', '--detach', join(taskRoot, 'worktree'), baseSha)
|
|
157
|
+
const after = await lstat(source)
|
|
158
|
+
if (identity.dev !== after.dev || identity.ino !== after.ino) throw new Error('Source repository identity changed.')
|
|
159
|
+
return { source, taskRoot, baseSha, sourceIdentity: `${identity.dev}:${identity.ino}` }
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
export async function captureCodingChanges(
|
|
163
|
+
workspace: CodingWorkspace,
|
|
164
|
+
execute: CodingExecutor,
|
|
165
|
+
writeArtifact: (path: string, text: string) => Promise<void>,
|
|
166
|
+
): Promise<ChangeArtifacts> {
|
|
167
|
+
const { taskRoot, baseSha } = workspace
|
|
168
|
+
await assertCodingDirectory(taskRoot)
|
|
169
|
+
const cwd = join(taskRoot, 'worktree')
|
|
170
|
+
const git = (...args: string[]) =>
|
|
171
|
+
execute(['git', '--no-replace-objects', '-c', 'core.hooksPath=/dev/null', ...args], cwd)
|
|
172
|
+
const untrackedFiles = (await git('ls-files', '--others', '--exclude-standard', '-z')).split('\0').filter(Boolean)
|
|
173
|
+
// Temporary index lives in sandbox scratch, not in the CLI's mutable index.
|
|
174
|
+
const temporary = `/tmp/typeclaw-index-${crypto.randomUUID()}`
|
|
175
|
+
// Each bwrap invocation has fresh /tmp: construct and consume the index in ONE process.
|
|
176
|
+
// The helper script is code we supply, with paths passed as positional parameters.
|
|
177
|
+
const script = [
|
|
178
|
+
'set -euo pipefail',
|
|
179
|
+
// A model-controlled replace ref must not redefine the recorded baseline.
|
|
180
|
+
'export GIT_NO_REPLACE_OBJECTS=1',
|
|
181
|
+
'index="$(git rev-parse --git-path index)"',
|
|
182
|
+
'objects="$(git rev-parse --git-path objects)"',
|
|
183
|
+
'export GIT_INDEX_FILE="$1"',
|
|
184
|
+
'export GIT_OBJECT_DIRECTORY="$1.objects"',
|
|
185
|
+
'export GIT_ALTERNATE_OBJECT_DIRECTORIES="$objects"',
|
|
186
|
+
'mkdir "$GIT_OBJECT_DIRECTORY"',
|
|
187
|
+
'trap \'rm -f "$GIT_INDEX_FILE"; rm -rf "$GIT_OBJECT_DIRECTORY"\' EXIT',
|
|
188
|
+
'if [ -f "$index" ]; then cp "$index" "$GIT_INDEX_FILE"; else git -c core.hooksPath=/dev/null read-tree HEAD; fi',
|
|
189
|
+
// Clear each flag separately: Git applies only one flag operation per update.
|
|
190
|
+
'git ls-files -z | git -c core.hooksPath=/dev/null update-index --no-assume-unchanged -z --stdin',
|
|
191
|
+
'git ls-files -z | git -c core.hooksPath=/dev/null update-index --no-skip-worktree -z --stdin',
|
|
192
|
+
'git -c core.hooksPath=/dev/null add -A -- .',
|
|
193
|
+
'if [ "$3" = patch ]; then',
|
|
194
|
+
' git -c core.hooksPath=/dev/null diff --cached --binary --full-index --no-ext-diff --no-textconv "$2" --',
|
|
195
|
+
'else',
|
|
196
|
+
' git -c core.hooksPath=/dev/null diff --cached --raw --numstat -z --no-renames --no-ext-diff --no-textconv "$2" --',
|
|
197
|
+
'fi',
|
|
198
|
+
].join('\n')
|
|
199
|
+
let patch: string
|
|
200
|
+
try {
|
|
201
|
+
patch = await execute(['bash', '-c', script, 'capture', temporary, baseSha, 'patch'], cwd)
|
|
202
|
+
} catch (error) {
|
|
203
|
+
if (error instanceof Error && error.message.includes('64 MiB')) {
|
|
204
|
+
return { changedFiles: [], untrackedFiles, patchPath: join(taskRoot, 'output', 'changes.patch'), oversized: true }
|
|
205
|
+
}
|
|
206
|
+
throw error
|
|
207
|
+
}
|
|
208
|
+
const inventory = await execute(['bash', '-c', script, 'capture', temporary, baseSha, 'inventory'], cwd)
|
|
209
|
+
const records = inventory.split('\0').filter(Boolean)
|
|
210
|
+
const changes: Array<{
|
|
211
|
+
path: string
|
|
212
|
+
status: string
|
|
213
|
+
oldMode: string
|
|
214
|
+
mode: string
|
|
215
|
+
binary: boolean
|
|
216
|
+
untracked: boolean
|
|
217
|
+
}> = []
|
|
218
|
+
const binary = new Set<string>()
|
|
219
|
+
for (let i = 0; i < records.length; i++) {
|
|
220
|
+
const record = records[i] ?? ''
|
|
221
|
+
const raw = /^:(\d+) (\d+) [a-f0-9]+ [a-f0-9]+ ([A-Z])$/.exec(record)
|
|
222
|
+
if (raw) {
|
|
223
|
+
const path = records[++i]
|
|
224
|
+
if (!path || !raw[1] || !raw[2] || !raw[3]) throw new Error('Git change inventory is incomplete.')
|
|
225
|
+
changes.push({
|
|
226
|
+
path,
|
|
227
|
+
status: raw[3],
|
|
228
|
+
oldMode: raw[1],
|
|
229
|
+
mode: raw[2],
|
|
230
|
+
binary: false,
|
|
231
|
+
untracked: untrackedFiles.includes(path),
|
|
232
|
+
})
|
|
233
|
+
} else if (record.startsWith('-\t-\t')) binary.add(record.slice(4))
|
|
234
|
+
}
|
|
235
|
+
for (const change of changes) change.binary = binary.has(change.path)
|
|
236
|
+
const changedFiles = changes.map((change) => change.path)
|
|
237
|
+
const patchPath = join(taskRoot, 'output', 'changes.patch')
|
|
238
|
+
await writeArtifact(patchPath, patch)
|
|
239
|
+
await writeArtifact(
|
|
240
|
+
join(taskRoot, 'output', 'changes.json'),
|
|
241
|
+
JSON.stringify(
|
|
242
|
+
{
|
|
243
|
+
baseSha,
|
|
244
|
+
changedFiles,
|
|
245
|
+
untrackedFiles,
|
|
246
|
+
changes,
|
|
247
|
+
},
|
|
248
|
+
null,
|
|
249
|
+
2,
|
|
250
|
+
),
|
|
251
|
+
)
|
|
252
|
+
return { changedFiles, untrackedFiles, patchPath, oversized: false }
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
export async function writeCodingArtifact(agentDir: string, targetPath: string, text: string): Promise<void> {
|
|
256
|
+
await writeFileAnchored({ agentDir, targetPath, data: Buffer.from(text), tool: 'coding_agent' })
|
|
257
|
+
}
|
|
258
|
+
|
|
259
|
+
export async function createTaskDirectory(agentDir: string, taskId: string): Promise<string> {
|
|
260
|
+
const root = join(agentDir, 'workspace', 'coding-agents')
|
|
261
|
+
const taskRoot = join(root, taskId)
|
|
262
|
+
if (process.platform === 'linux') {
|
|
263
|
+
const parent = await createAndOpenAnchoredDirectory(root)
|
|
264
|
+
try {
|
|
265
|
+
const anchored = `/proc/self/fd/${parent.fd}/${taskId}`
|
|
266
|
+
await mkdir(anchored, { mode: 0o700 })
|
|
267
|
+
const task = await open(anchored, constants.O_RDONLY | constants.O_DIRECTORY | constants.O_NOFOLLOW)
|
|
268
|
+
try {
|
|
269
|
+
for (const part of ['claude', 'codex', 'output'])
|
|
270
|
+
await mkdir(`/proc/self/fd/${task.fd}/${part}`, { mode: 0o700 })
|
|
271
|
+
} finally {
|
|
272
|
+
await task.close()
|
|
273
|
+
}
|
|
274
|
+
} finally {
|
|
275
|
+
await parent.close()
|
|
276
|
+
}
|
|
277
|
+
return taskRoot
|
|
278
|
+
}
|
|
279
|
+
// Dev-stage fixture setup. Production invocation still requires Linux bwrap.
|
|
280
|
+
// No-follow every existing component, including the shared workspace.
|
|
281
|
+
for (const path of [agentDir, join(agentDir, 'workspace'), root]) {
|
|
282
|
+
await mkdir(path, { recursive: true })
|
|
283
|
+
await assertCodingDirectory(path)
|
|
284
|
+
}
|
|
285
|
+
await mkdir(taskRoot, { mode: 0o700 })
|
|
286
|
+
for (const part of ['claude', 'codex', 'output']) await mkdir(join(taskRoot, part), { mode: 0o700 })
|
|
287
|
+
return taskRoot
|
|
288
|
+
}
|
|
289
|
+
|
|
290
|
+
export async function disposeCodingWorkspace(workspace: CodingWorkspace, execute: CodingExecutor): Promise<void> {
|
|
291
|
+
await assertCodingDirectory(workspace.taskRoot)
|
|
292
|
+
const exists = await lstat(join(workspace.taskRoot, 'worktree')).catch((error: unknown) => {
|
|
293
|
+
if (error instanceof Error && 'code' in error && error.code === 'ENOENT') return undefined
|
|
294
|
+
throw error
|
|
295
|
+
})
|
|
296
|
+
if (exists)
|
|
297
|
+
await execute(
|
|
298
|
+
[
|
|
299
|
+
'git',
|
|
300
|
+
'--git-dir',
|
|
301
|
+
join(workspace.taskRoot, 'git'),
|
|
302
|
+
'worktree',
|
|
303
|
+
'remove',
|
|
304
|
+
'--force',
|
|
305
|
+
join(workspace.taskRoot, 'worktree'),
|
|
306
|
+
],
|
|
307
|
+
workspace.taskRoot,
|
|
308
|
+
)
|
|
309
|
+
if (process.platform === 'linux') {
|
|
310
|
+
const parent = await createAndOpenAnchoredDirectory(dirname(workspace.taskRoot), false)
|
|
311
|
+
try {
|
|
312
|
+
await rm(`/proc/self/fd/${parent.fd}/${workspace.taskRoot.split('/').at(-1)}`, { recursive: true })
|
|
313
|
+
} finally {
|
|
314
|
+
await parent.close()
|
|
315
|
+
}
|
|
316
|
+
} else await rm(workspace.taskRoot, { recursive: true })
|
|
317
|
+
}
|
|
318
|
+
|
|
319
|
+
export async function writeTaskRegistry(path: string, text: string): Promise<void> {
|
|
320
|
+
await mkdir(dirname(path), { recursive: true })
|
|
321
|
+
await assertCodingDirectory(dirname(path))
|
|
322
|
+
const parent = process.platform === 'linux' ? await createAndOpenAnchoredDirectory(dirname(path), false) : undefined
|
|
323
|
+
try {
|
|
324
|
+
const target = parent ? `/proc/self/fd/${parent.fd}/coding-agent-tasks.json` : path
|
|
325
|
+
const temporary = `${target}.${crypto.randomUUID()}.tmp`
|
|
326
|
+
const file = await open(
|
|
327
|
+
temporary,
|
|
328
|
+
constants.O_CREAT | constants.O_EXCL | constants.O_WRONLY | constants.O_NOFOLLOW,
|
|
329
|
+
0o600,
|
|
330
|
+
)
|
|
331
|
+
try {
|
|
332
|
+
await file.writeFile(text)
|
|
333
|
+
} finally {
|
|
334
|
+
await file.close()
|
|
335
|
+
}
|
|
336
|
+
await rename(temporary, target)
|
|
337
|
+
} finally {
|
|
338
|
+
await parent?.close()
|
|
339
|
+
}
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
export async function resolveCodingSource(
|
|
343
|
+
agentDir: string,
|
|
344
|
+
repo: string,
|
|
345
|
+
mountNames: readonly string[],
|
|
346
|
+
): Promise<string> {
|
|
347
|
+
const target = resolve(agentDir, repo)
|
|
348
|
+
const roots = [agentDir, ...mountNames.map((name) => join(agentDir, 'mounts', name))]
|
|
349
|
+
if (!roots.some((root) => target === root || target.startsWith(`${join(agentDir, 'workspace')}/`))) {
|
|
350
|
+
throw new Error('Repository is not an accessible agent, workspace, or configured mount root.')
|
|
351
|
+
}
|
|
352
|
+
const actual = await realpath(target)
|
|
353
|
+
if (actual !== target) throw new Error('Repository symlink aliases are not supported; select the configured root.')
|
|
354
|
+
return actual
|
|
355
|
+
}
|
package/src/compose/restart.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { validateConfig } from '@/config'
|
|
|
2
2
|
import { type Controller, resolveController } from '@/container'
|
|
3
3
|
|
|
4
4
|
import { discoverAgents, type AgentEntry } from './discover'
|
|
5
|
-
import type
|
|
5
|
+
import { checkFleetMemory, type AgentResult, type StartSuccess } from './start'
|
|
6
6
|
import type { StopSuccess } from './stop'
|
|
7
7
|
|
|
8
8
|
export type RestartData = { stop: StopSuccess; start: StartSuccess }
|
|
@@ -22,16 +22,21 @@ export type ComposeRestartOptions = {
|
|
|
22
22
|
|
|
23
23
|
export type ComposeRestartDeps = {
|
|
24
24
|
restart?: Controller['restart']
|
|
25
|
+
checkMemory?: () => Promise<string[] | null>
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
export type ComposeRestartResult = {
|
|
28
29
|
agents: AgentEntry[]
|
|
29
30
|
results: AgentResult<RestartData>[]
|
|
31
|
+
memoryWarning: string[] | null
|
|
30
32
|
}
|
|
31
33
|
|
|
32
34
|
export async function composeRestart(
|
|
33
35
|
{ rootCwd, preferredHostPort, forceBuild = false, cliEntry, onProgress }: ComposeRestartOptions,
|
|
34
|
-
{
|
|
36
|
+
{
|
|
37
|
+
restart = (options) => resolveController().restart(options),
|
|
38
|
+
checkMemory = checkFleetMemory,
|
|
39
|
+
}: ComposeRestartDeps = {},
|
|
35
40
|
): Promise<ComposeRestartResult> {
|
|
36
41
|
const agents = discoverAgents(rootCwd)
|
|
37
42
|
const results = await Promise.all(
|
|
@@ -50,7 +55,8 @@ export async function composeRestart(
|
|
|
50
55
|
return result
|
|
51
56
|
}),
|
|
52
57
|
)
|
|
53
|
-
|
|
58
|
+
const memoryWarning = results.some((r) => r.ok) ? await checkMemory() : null
|
|
59
|
+
return { agents, results, memoryWarning }
|
|
54
60
|
}
|
|
55
61
|
|
|
56
62
|
async function runOne(
|
|
@@ -73,6 +79,7 @@ async function runOne(
|
|
|
73
79
|
cliEntry,
|
|
74
80
|
onStopped,
|
|
75
81
|
streamOutput: false,
|
|
82
|
+
skipMemoryOversubscriptionCheck: true,
|
|
76
83
|
onWarning: (warning) => warnings.push(warning),
|
|
77
84
|
})
|
|
78
85
|
if (!restarted.ok) return { name, ok: false, reason: restarted.reason, warnings }
|
package/src/compose/start.ts
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
import { validateConfig } from '@/config'
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
type Controller,
|
|
4
|
+
defaultDockerExec,
|
|
5
|
+
formatOversubscriptionWarning,
|
|
6
|
+
readFleetMemoryOversubscription,
|
|
7
|
+
resolveController,
|
|
8
|
+
type StartResult,
|
|
9
|
+
} from '@/container'
|
|
3
10
|
|
|
4
11
|
import { discoverAgents, type AgentEntry } from './discover'
|
|
5
12
|
|
|
@@ -23,16 +30,19 @@ export type ComposeStartOptions = {
|
|
|
23
30
|
|
|
24
31
|
export type ComposeStartDeps = {
|
|
25
32
|
start?: Controller['start']
|
|
33
|
+
checkMemory?: () => Promise<string[] | null>
|
|
26
34
|
}
|
|
27
35
|
|
|
28
36
|
export type ComposeStartResult = {
|
|
29
37
|
agents: AgentEntry[]
|
|
30
38
|
results: AgentResult<StartSuccess>[]
|
|
39
|
+
// Fleet-wide, reported once — see readFleetMemoryOversubscription.
|
|
40
|
+
memoryWarning: string[] | null
|
|
31
41
|
}
|
|
32
42
|
|
|
33
43
|
export async function composeStart(
|
|
34
44
|
{ rootCwd, preferredHostPort, forceBuild = false, cliEntry, onProgress }: ComposeStartOptions,
|
|
35
|
-
{ start = (options) => resolveController().start(options) }: ComposeStartDeps = {},
|
|
45
|
+
{ start = (options) => resolveController().start(options), checkMemory = checkFleetMemory }: ComposeStartDeps = {},
|
|
36
46
|
): Promise<ComposeStartResult> {
|
|
37
47
|
const agents = discoverAgents(rootCwd)
|
|
38
48
|
const results = await Promise.all(
|
|
@@ -43,7 +53,13 @@ export async function composeStart(
|
|
|
43
53
|
return result
|
|
44
54
|
}),
|
|
45
55
|
)
|
|
46
|
-
|
|
56
|
+
const memoryWarning = results.some((r) => r.ok) ? await checkMemory() : null
|
|
57
|
+
return { agents, results, memoryWarning }
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
export async function checkFleetMemory(): Promise<string[] | null> {
|
|
61
|
+
const warning = await readFleetMemoryOversubscription(defaultDockerExec)
|
|
62
|
+
return warning === null ? null : formatOversubscriptionWarning(warning)
|
|
47
63
|
}
|
|
48
64
|
|
|
49
65
|
async function runOne(
|
|
@@ -64,6 +80,7 @@ async function runOne(
|
|
|
64
80
|
forceBuild,
|
|
65
81
|
cliEntry,
|
|
66
82
|
streamOutput: false,
|
|
83
|
+
skipMemoryOversubscriptionCheck: true,
|
|
67
84
|
onWarning: (warning) => warnings.push(warning),
|
|
68
85
|
})
|
|
69
86
|
if (!data.ok) return { name, ok: false, reason: data.reason, warnings }
|
package/src/config/config.ts
CHANGED
|
@@ -2,7 +2,8 @@ import { accessSync, constants as fsConstants, readFileSync, statSync, writeFile
|
|
|
2
2
|
import { homedir } from 'node:os'
|
|
3
3
|
import { isAbsolute, join, posix, resolve } from 'node:path'
|
|
4
4
|
|
|
5
|
-
import type { KnownApi, Model } from '@
|
|
5
|
+
import type { KnownApi, Model } from '@earendil-works/pi-ai'
|
|
6
|
+
import { getBuiltinModel } from '@earendil-works/pi-ai/providers/all'
|
|
6
7
|
import { z } from 'zod'
|
|
7
8
|
|
|
8
9
|
import { channelsSchema, SEEDED_GITHUB_EVENT_ALLOWLISTS } from '@/channels/schema'
|
|
@@ -243,6 +244,9 @@ const dockerfileObjectSchema = z.object({
|
|
|
243
244
|
// restart-required semantics, separate hook scripts (Codex uses
|
|
244
245
|
// hooks.json with a different event matcher than Claude Code).
|
|
245
246
|
codexCli: z.boolean().default(false),
|
|
247
|
+
// Pinned native OmO executable; its task-local config is generated by the
|
|
248
|
+
// brokered runner, never provisioned with operator credentials.
|
|
249
|
+
omoCli: z.boolean().default(false),
|
|
246
250
|
append: z.array(dockerfileLineSchema).default([]),
|
|
247
251
|
})
|
|
248
252
|
|
|
@@ -676,7 +680,7 @@ function asModelRef(value: string): ModelRef {
|
|
|
676
680
|
// Mirrors pi-coding-agent's `ThinkingLevel`. Kept as a local enum (rather than
|
|
677
681
|
// importing the SDK type) so the schema owns the canonical value list and zod
|
|
678
682
|
// can validate `typeclaw.json` without a runtime SDK dependency.
|
|
679
|
-
export const thinkingLevelSchema = z.enum(['off', 'minimal', 'low', 'medium', 'high', 'xhigh'])
|
|
683
|
+
export const thinkingLevelSchema = z.enum(['off', 'minimal', 'low', 'medium', 'high', 'xhigh', 'max'])
|
|
680
684
|
export type ThinkingLevel = z.infer<typeof thinkingLevelSchema>
|
|
681
685
|
|
|
682
686
|
// Reject exact duplicates in a chain — retrying the same ref after the same
|
|
@@ -842,44 +846,84 @@ export function resolveModel(ref: KnownModelRef | ModelRef | string): Model<Know
|
|
|
842
846
|
}
|
|
843
847
|
|
|
844
848
|
const meta = getConfig().customModels[ref]
|
|
849
|
+
// `api`, `baseUrl`, and (by default) `compat` come from the provider template
|
|
850
|
+
// because they describe the PROVIDER's wire dialect, not the model. pi-ai
|
|
851
|
+
// infers compat from the baseUrl and only recognises first-party hosts, so a
|
|
852
|
+
// custom ref on a provider that pins compat (OpenGateway, Upstage) would
|
|
853
|
+
// otherwise fall back to OpenAI-native defaults and send `store`, the
|
|
854
|
+
// `developer` role, `strict` tool schemas and `max_completion_tokens` to an
|
|
855
|
+
// endpoint that never accepts them.
|
|
856
|
+
//
|
|
857
|
+
// The exception is a ref that pi-ai's catalog already knows, exactly or as
|
|
858
|
+
// its undated `-YYYYMMDD` base, on the same transport. The catalog describes
|
|
859
|
+
// the MODEL, so its name, capabilities, limits, and pricing are the defaults;
|
|
860
|
+
// `customModels` remains the explicit per-field override. pi 0.87 reads some
|
|
861
|
+
// behavior only from per-model metadata: e.g. Anthropic adaptive thinking is
|
|
862
|
+
// `compat.forceAdaptiveThinking` and is no longer inferred from the id.
|
|
863
|
+
// Anthropic's streamSimple gates adaptive thinking on the resolved model's
|
|
864
|
+
// `reasoning` capability, so a dated Sonnet 5 alias must inherit that too.
|
|
865
|
+
// That entry's compat and thinkingLevelMap are used, minus
|
|
866
|
+
// `allowedFallbackModels` (see the Fable 5 record) and `supportsStrictTools`
|
|
867
|
+
// (see the Anthropic records in providers.ts). Without a catalog match
|
|
868
|
+
// `thinkingLevelMap` is deliberately not carried: it varies per model even
|
|
869
|
+
// within one provider, so copying the template's would be a guess.
|
|
870
|
+
const builtin = findBuiltinModel(providerId, modelId)
|
|
871
|
+
const catalogMetadata = builtin !== undefined && builtin.api === template.api ? builtin : undefined
|
|
872
|
+
let compat = template.compat
|
|
873
|
+
if (catalogMetadata !== undefined) {
|
|
874
|
+
const catalogCompat: Record<string, unknown> | undefined =
|
|
875
|
+
catalogMetadata.compat === undefined ? undefined : { ...catalogMetadata.compat }
|
|
876
|
+
if (catalogCompat !== undefined) {
|
|
877
|
+
delete catalogCompat.allowedFallbackModels
|
|
878
|
+
delete catalogCompat.supportsStrictTools
|
|
879
|
+
}
|
|
880
|
+
compat = catalogCompat as Model<KnownApi>['compat']
|
|
881
|
+
}
|
|
845
882
|
return {
|
|
846
883
|
id: modelId,
|
|
847
884
|
provider: providerId,
|
|
848
885
|
baseUrl: provider.baseUrl ?? template.baseUrl,
|
|
849
886
|
api: template.api,
|
|
850
|
-
|
|
851
|
-
|
|
852
|
-
|
|
853
|
-
|
|
854
|
-
|
|
855
|
-
|
|
856
|
-
|
|
857
|
-
|
|
858
|
-
// the template's would be a guess.
|
|
859
|
-
...(template.compat !== undefined ? { compat: template.compat } : {}),
|
|
860
|
-
name: meta?.name ?? modelId,
|
|
861
|
-
reasoning: meta?.reasoning ?? false,
|
|
862
|
-
input: resolveCustomModelInput(meta?.input),
|
|
863
|
-
contextWindow: meta?.contextWindow ?? template.contextWindow,
|
|
864
|
-
maxTokens: meta?.maxTokens ?? template.maxTokens,
|
|
865
|
-
cost: resolveCustomModelCost(meta?.cost),
|
|
887
|
+
...(compat !== undefined ? { compat } : {}),
|
|
888
|
+
...(catalogMetadata?.thinkingLevelMap !== undefined ? { thinkingLevelMap: catalogMetadata.thinkingLevelMap } : {}),
|
|
889
|
+
name: meta?.name ?? catalogMetadata?.name ?? modelId,
|
|
890
|
+
reasoning: meta?.reasoning ?? catalogMetadata?.reasoning ?? false,
|
|
891
|
+
input: resolveCustomModelInput(meta?.input, catalogMetadata?.input),
|
|
892
|
+
contextWindow: meta?.contextWindow ?? catalogMetadata?.contextWindow ?? template.contextWindow,
|
|
893
|
+
maxTokens: meta?.maxTokens ?? catalogMetadata?.maxTokens ?? template.maxTokens,
|
|
894
|
+
cost: resolveCustomModelCost(meta?.cost, catalogMetadata?.cost),
|
|
866
895
|
}
|
|
867
896
|
}
|
|
868
897
|
|
|
869
|
-
function
|
|
870
|
-
|
|
898
|
+
function findBuiltinModel(providerId: string, modelId: string): Model<KnownApi> | undefined {
|
|
899
|
+
const direct = getBuiltinModel(providerId as never, modelId as never) as Model<KnownApi> | undefined
|
|
900
|
+
if (direct !== undefined) return direct
|
|
901
|
+
const undatedId = modelId.replace(/-\d{8}$/, '')
|
|
902
|
+
return undatedId === modelId
|
|
903
|
+
? undefined
|
|
904
|
+
: (getBuiltinModel(providerId as never, undatedId as never) as Model<KnownApi> | undefined)
|
|
905
|
+
}
|
|
906
|
+
|
|
907
|
+
function resolveCustomModelInput(
|
|
908
|
+
input: readonly string[] | undefined,
|
|
909
|
+
fallback: Model<KnownApi>['input'] | undefined,
|
|
910
|
+
): Model<KnownApi>['input'] {
|
|
911
|
+
if (input === undefined) return fallback ?? ['text']
|
|
871
912
|
const supported = input.filter(
|
|
872
913
|
(value): value is Model<KnownApi>['input'][number] => value === 'text' || value === 'image',
|
|
873
914
|
)
|
|
874
915
|
return supported.length > 0 ? supported : ['text']
|
|
875
916
|
}
|
|
876
917
|
|
|
877
|
-
function resolveCustomModelCost(
|
|
918
|
+
function resolveCustomModelCost(
|
|
919
|
+
cost: CustomModelMeta['cost'],
|
|
920
|
+
fallback: Model<KnownApi>['cost'] | undefined,
|
|
921
|
+
): Model<KnownApi>['cost'] {
|
|
878
922
|
return {
|
|
879
|
-
input: cost?.input ?? 0,
|
|
880
|
-
output: cost?.output ?? 0,
|
|
881
|
-
cacheRead: cost?.cacheRead ?? 0,
|
|
882
|
-
cacheWrite: cost?.cacheWrite ?? 0,
|
|
923
|
+
input: cost?.input ?? fallback?.input ?? 0,
|
|
924
|
+
output: cost?.output ?? fallback?.output ?? 0,
|
|
925
|
+
cacheRead: cost?.cacheRead ?? fallback?.cacheRead ?? 0,
|
|
926
|
+
cacheWrite: cost?.cacheWrite ?? fallback?.cacheWrite ?? 0,
|
|
883
927
|
}
|
|
884
928
|
}
|
|
885
929
|
|
|
@@ -1038,7 +1082,7 @@ export const FIELD_EFFECTS: Record<string, FieldEffect> = {
|
|
|
1038
1082
|
network: 'restart-required',
|
|
1039
1083
|
sandbox: 'restart-required',
|
|
1040
1084
|
tunnels: 'restart-required',
|
|
1041
|
-
'docker.file': 'restart-required',
|
|
1085
|
+
'docker.file': 'restart-required', // Includes omoCli; installation changes rebuild the image.
|
|
1042
1086
|
'git.ignore': 'restart-required',
|
|
1043
1087
|
logs: 'ignored',
|
|
1044
1088
|
// Split: `match` lists are reload-safe (typeclaw role claim, hand-edits
|