minicode-ai 0.14.2 → 0.14.4
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/README.md +34 -178
- package/cli/args.ts +10 -18
- package/cli/commands/acp.ts +20 -27
- package/cli/commands/daemon.ts +6 -7
- package/cli/commands/exec.ts +12 -10
- package/cli/commands.ts +6 -9
- package/cli/index.ts +30 -15
- package/cli/provider-manager.ts +1 -3
- package/cli/setup.ts +167 -143
- package/cli/tui.ts +15 -23
- package/docs/CONTROL-PLANE-MAP.md +145 -0
- package/docs/OUTPUT_EVENT_MODEL.md +1 -1
- package/docs/OUTPUT_PROTOCOL_SPEC.md +2 -2
- package/docs/OUTPUT_RENDERING_SPEC.md +7 -2
- package/docs/OUTPUT_UX_RULES.md +1 -1
- package/docs/README.md +14 -102
- package/docs/SUMMARY.md +53 -0
- package/docs/TERMINAL_CONTRACT.md +84 -51
- package/docs/UI_RENDER_PIPELINE.md +204 -0
- package/docs/agents.md +5 -5
- package/docs/architecture.md +23 -12
- package/docs/choosing-mode.md +7 -7
- package/docs/cli.md +22 -29
- package/docs/concepts.md +1 -1
- package/docs/config.md +10 -5
- package/docs/contributing.md +6 -6
- package/docs/environment.md +3 -1
- package/docs/exec.md +5 -5
- package/docs/glossary.md +8 -6
- package/docs/memory-sessions.md +7 -5
- package/docs/policy-sandbox.md +16 -14
- package/docs/quickstart.md +2 -2
- package/docs/repl.md +4 -3
- package/docs/security-model.md +14 -15
- package/docs/security.md +8 -29
- package/docs/skills.md +1 -1
- package/docs/tools.md +2 -2
- package/package.json +5 -3
- package/scripts/vendor-overlays/minicode-context.patch +109 -0
- package/src/app/provider-layer.ts +13 -1
- package/src/app/session.ts +216 -13
- package/src/config.ts +30 -3
- package/src/constants.ts +2 -0
- package/src/daemon/control.ts +1 -1
- package/src/mcp/server.ts +2 -3
- package/src/policy/compaction.ts +272 -16
- package/src/policy/context-window.ts +73 -0
- package/src/policy/context.ts +55 -3
- package/src/policy/ratelimit.ts +47 -18
- package/src/policy/usage.ts +15 -8
- package/src/policy/work-mode.ts +1 -1
- package/src/providers/guards.ts +61 -4
- package/src/providers/provision.ts +12 -3
- package/src/providers/router.ts +56 -23
- package/src/session/context-projection.ts +14 -0
- package/src/session/context-selector.ts +58 -20
- package/src/session/persistence.ts +1 -1
- package/src/task/model.ts +21 -70
- package/src/tools/task.ts +7 -0
- package/src/ui/footer.ts +131 -66
- package/src/ui/i18n/en.ts +0 -11
- package/src/ui/i18n/id.ts +0 -11
- package/src/ui/input/input.ts +2 -3
- package/src/ui/input/prompt-engine.ts +2 -5
- package/src/ui/screens/model-manager.ts +3 -10
- package/src/ui/screens/picker.ts +23 -40
- package/src/ui/screens/provider-manager.ts +12 -33
- package/src/ui/screens/wizard.ts +0 -1
- package/src/ui/tui/app.ts +10 -6
- package/src/ui/tui/transcript.ts +48 -8
- package/vendor/minicore/VENDOR.md +9 -5
- package/vendor/minicore/src/core/loop.ts +47 -12
- package/vendor/minicore/src/core/provider.ts +4 -0
- package/vendor/minicore/src/core/session.ts +14 -1
- package/docs/OUTPUT_ARCHITECTURE_AUDIT.md +0 -489
- package/docs/OUTPUT_IMPLEMENTATION_PLAN.md +0 -391
package/cli/index.ts
CHANGED
|
@@ -23,6 +23,7 @@ import { formatUsd } from "../src/ui/render/money.ts"
|
|
|
23
23
|
import { c, glyphs } from "../src/ui/render/theme.ts"
|
|
24
24
|
import {
|
|
25
25
|
allowLocalConfig,
|
|
26
|
+
displayWorkMode,
|
|
26
27
|
flagsAfterPromptBoundary,
|
|
27
28
|
hasFlag,
|
|
28
29
|
promptFromArgs,
|
|
@@ -80,7 +81,7 @@ Options:
|
|
|
80
81
|
--budget <usd> session cost limit
|
|
81
82
|
--budget-strict unknown cost + spend counts as over budget (fail-closed default)
|
|
82
83
|
--tool-scope <s> full (default) | explore (read-only subset)
|
|
83
|
-
--work-mode <m> DISCUSS | PLAN | BUILD (default). Operating mode: DISCUSS =
|
|
84
|
+
--work-mode <m> DISCUSS | PLAN | BUILD (default: DISCUSS). Operating mode: DISCUSS =
|
|
84
85
|
read-only investigation, PLAN = planning, BUILD = implementation.
|
|
85
86
|
--tui deprecated no-op (interactive mode is always the fullscreen TUI)
|
|
86
87
|
--enable-scheduler EXPERIMENTAL: opt in to the autonomous scheduler (default: off).
|
|
@@ -149,7 +150,18 @@ if (
|
|
|
149
150
|
setSubAgentSessionFactory(async (spec) => {
|
|
150
151
|
// `journal` hanya untuk wiring app-layer — jangan bocor ke config kernel.
|
|
151
152
|
const { journal, ...coreSpec } = spec
|
|
152
|
-
const
|
|
153
|
+
const contextWindowTokensForModel = coreSpec.provider.contextWindowTokensForModel
|
|
154
|
+
const contextModelIdentity = coreSpec.provider.contextModelIdentity
|
|
155
|
+
const session = await createMinicodeSession({
|
|
156
|
+
...coreSpec,
|
|
157
|
+
...(contextWindowTokensForModel
|
|
158
|
+
? {
|
|
159
|
+
contextWindowTokens: contextWindowTokensForModel(coreSpec.model),
|
|
160
|
+
contextWindowTokensForModel,
|
|
161
|
+
getContextModel: () => contextModelIdentity?.(coreSpec.model) ?? coreSpec.model,
|
|
162
|
+
}
|
|
163
|
+
: {}),
|
|
164
|
+
})
|
|
153
165
|
if (journal) {
|
|
154
166
|
const childPresentation = (
|
|
155
167
|
await import("../src/presentation/adapter.ts")
|
|
@@ -257,7 +269,7 @@ if (args.includes("-h") || args.includes("--help")) {
|
|
|
257
269
|
{ flag: "--tool-scope <full|explore>", desc: "tool subset (explore = read-only)" },
|
|
258
270
|
{
|
|
259
271
|
flag: "--work-mode <DISCUSS|PLAN|BUILD>",
|
|
260
|
-
desc: "operating mode: DISCUSS (read-only), PLAN (planning), BUILD
|
|
272
|
+
desc: "operating mode: DISCUSS (default, read-only), PLAN (planning), BUILD",
|
|
261
273
|
},
|
|
262
274
|
{ flag: "--json", desc: "JSON output (help/exec)" },
|
|
263
275
|
{ flag: "--tui", desc: "deprecated no-op (interactive is always the fullscreen TUI)" },
|
|
@@ -294,15 +306,13 @@ const cwd = cwdRaw ? resolvePath(cwdRaw) : undefined
|
|
|
294
306
|
// eksplisit per-invokasi (flag atau env). Tanpa ini repo clone-an bisa
|
|
295
307
|
// men-spawn MCP server dan menyedot prompt ke endpoint penyerang.
|
|
296
308
|
const allowLocal = allowLocalConfig(args)
|
|
297
|
-
//
|
|
298
|
-
//
|
|
299
|
-
//
|
|
300
|
-
// disamakan dengan WorkMode PLAN — keduanya lapisan terpisah.
|
|
309
|
+
// WorkMode (lapis intent di atas profil izin). Flag mengalahkan env;
|
|
310
|
+
// keduanya tak ada atau nilainya tak dikenal = DISCUSS (fail-closed).
|
|
311
|
+
// `--plan` adalah alias legacy untuk WorkMode PLAN.
|
|
301
312
|
const workModeResolved = resolveWorkModeFlag(getArg)
|
|
302
313
|
const workMode = workModeResolved.workMode
|
|
303
|
-
//
|
|
304
|
-
//
|
|
305
|
-
// default EXECUTE saat tak diberi ulang.
|
|
314
|
+
// Sinyal WorkMode eksplisit (flag/env) ikut diteruskan agar resume dapat
|
|
315
|
+
// membedakan pilihan sesi tersimpan dari default DISCUSS.
|
|
306
316
|
const workModeExplicit = workModeResolved.explicit
|
|
307
317
|
if (workModeResolved.warning) process.stderr.write(`[warn] ${workModeResolved.warning}\n`)
|
|
308
318
|
// [PHASE 6U] Autonomous Scheduler opt-in. DEFAULT OFF.
|
|
@@ -544,7 +554,7 @@ try {
|
|
|
544
554
|
budget,
|
|
545
555
|
budgetStrict,
|
|
546
556
|
toolScope,
|
|
547
|
-
//
|
|
557
|
+
// WorkMode efektif (sudah di-resolve, default DISCUSS).
|
|
548
558
|
workMode,
|
|
549
559
|
// P12 S2.2 (D-2) — transparansi resume: tahu apakah WorkMode diberi eksplisit.
|
|
550
560
|
workModeExplicit,
|
|
@@ -591,10 +601,15 @@ if (enterRepl) {
|
|
|
591
601
|
} else {
|
|
592
602
|
// P12 S2.2 (F-DISCUSS-4) + P0.2: one-shot linear memakai `ctx.workMode`
|
|
593
603
|
// efektif (termasuk hasil pulihan `--resume`).
|
|
594
|
-
if (ctx.workMode !== "EXECUTE") {
|
|
595
|
-
|
|
596
|
-
|
|
597
|
-
|
|
604
|
+
if (ctx.workMode !== "EXECUTE" || workModeExplicit) {
|
|
605
|
+
const workModeLabel = displayWorkMode(ctx.workMode)
|
|
606
|
+
const modeNote =
|
|
607
|
+
ctx.workMode === "PLAN"
|
|
608
|
+
? " (read-only planning)"
|
|
609
|
+
: ctx.workMode === "DISCUSS"
|
|
610
|
+
? " (read-only)"
|
|
611
|
+
: ""
|
|
612
|
+
process.stderr.write(`[work-mode] ${workModeLabel}${modeNote}\n`)
|
|
598
613
|
}
|
|
599
614
|
const {
|
|
600
615
|
session,
|
package/cli/provider-manager.ts
CHANGED
|
@@ -30,9 +30,7 @@ export async function runProviderManager(opts: {
|
|
|
30
30
|
}): Promise<void> {
|
|
31
31
|
if (!process.stdin.isTTY) {
|
|
32
32
|
const cfg = await loadConfig(opts.cwd, { allowLocal: opts.allowLocalConfig })
|
|
33
|
-
console.log(
|
|
34
|
-
for (const p of cfg.providers)
|
|
35
|
-
console.log(` ${p.id} - ${p.baseUrl} (${t("prov.models", { n: p.models.length })})`)
|
|
33
|
+
for (const p of cfg.providers) console.log(p.id)
|
|
36
34
|
return
|
|
37
35
|
}
|
|
38
36
|
|
package/cli/setup.ts
CHANGED
|
@@ -14,6 +14,7 @@ import {
|
|
|
14
14
|
import { setupToolLayer } from "../src/app/tool-layer.ts"
|
|
15
15
|
import type { MinicodeConfig } from "../src/config.ts"
|
|
16
16
|
import { loadLastModel, localConfigNotice } from "../src/config.ts"
|
|
17
|
+
import { LIMITS } from "../src/constants.ts"
|
|
17
18
|
import { runRunHooks, shouldRunHooks } from "../src/hooks/run.ts"
|
|
18
19
|
import { homeDir } from "../src/lib/db-path.ts"
|
|
19
20
|
import { closeAllLsp as lspCloseAll, setLspProcessSupervisor } from "../src/lsp/client.ts"
|
|
@@ -26,6 +27,8 @@ import {
|
|
|
26
27
|
evaluateConsequence,
|
|
27
28
|
isAceEnabled,
|
|
28
29
|
} from "../src/policy/consequence-engine.ts"
|
|
30
|
+
import { minicodeEstimator } from "../src/policy/context.ts"
|
|
31
|
+
import { resolveContextWindow } from "../src/policy/context-window.ts"
|
|
29
32
|
import type { NoProgressDetector } from "../src/policy/no-progress.ts"
|
|
30
33
|
import type { PermissionAsk } from "../src/policy/permission.ts"
|
|
31
34
|
import type { RateLimiter } from "../src/policy/ratelimit.ts"
|
|
@@ -36,7 +39,6 @@ import {
|
|
|
36
39
|
primePricing,
|
|
37
40
|
type UsageInitialSnapshot,
|
|
38
41
|
watchBudgetLimit,
|
|
39
|
-
watchContextWindowLimit,
|
|
40
42
|
} from "../src/policy/usage.ts"
|
|
41
43
|
import {
|
|
42
44
|
buildBaselineNote,
|
|
@@ -224,6 +226,7 @@ import type {
|
|
|
224
226
|
UiToolStatus,
|
|
225
227
|
UiTurnSummary,
|
|
226
228
|
} from "../src/ui/contract.ts"
|
|
229
|
+
import { sanitizeAnsi } from "../src/ui/render/sanitize.ts"
|
|
227
230
|
import { c } from "../src/ui/render/theme.ts"
|
|
228
231
|
// [Area A · PROMPT 06] State UI per-sesi. Satu instance per `createCliSession`.
|
|
229
232
|
import { UiSessionState } from "../src/ui/session-state.ts"
|
|
@@ -298,18 +301,18 @@ export interface CliSessionOptions {
|
|
|
298
301
|
/** Harness-P2: scope tool sesi — explore = subset read-only. */
|
|
299
302
|
toolScope?: "full" | "explore"
|
|
300
303
|
/**
|
|
301
|
-
*
|
|
302
|
-
*
|
|
304
|
+
* WorkMode (lapis intent di atas profil izin). Default DISCUSS = read-only;
|
|
305
|
+
* PLAN = ceiling
|
|
303
306
|
* rencana (explore + tool rencana). TIDAK pernah memperluas permission mode
|
|
304
307
|
* (INV-WM1). Diisi CLI dari --work-mode / MINICODE_WORK_MODE; diserahkan ke
|
|
305
308
|
* setupToolLayer (visibilitas) dan createMinicodeSession (handler ceiling).
|
|
306
309
|
*/
|
|
307
310
|
workMode?: "DISCUSS" | "PLAN" | "EXECUTE"
|
|
308
311
|
/**
|
|
309
|
-
*
|
|
310
|
-
*
|
|
311
|
-
*
|
|
312
|
-
*
|
|
312
|
+
* Transparansi resume. Benar bila operator memberi sinyal WorkMode eksplisit
|
|
313
|
+
* (--work-mode / MINICODE_WORK_MODE). Saat resume tanpa sinyal eksplisit,
|
|
314
|
+
* WorkMode tersimpan dipulihkan; legacy tanpa nilai kembali ke DISCUSS.
|
|
315
|
+
* Bila scope ini `false` DAN identitas sesi `resumed`, composition
|
|
313
316
|
* root menulis SATU baris stderr human-facing (bukan output machine) agar
|
|
314
317
|
* transisi tidak terjadi diam-diam.
|
|
315
318
|
*/
|
|
@@ -397,7 +400,7 @@ export interface CliSession {
|
|
|
397
400
|
effectiveInitialModel: string
|
|
398
401
|
effectiveTimeoutMs: number
|
|
399
402
|
permissionMode: string
|
|
400
|
-
/**
|
|
403
|
+
/** WorkMode efektif sesi ini (default DISCUSS). Dipakai label/
|
|
401
404
|
* readout TUI; diisi composition root dari flag/env. */
|
|
402
405
|
workMode: "DISCUSS" | "PLAN" | "EXECUTE"
|
|
403
406
|
/** P12 S2.2 Slice 5 — handle kontrol WorkMode runtime (transisi operator
|
|
@@ -411,6 +414,8 @@ export interface CliSession {
|
|
|
411
414
|
budgetStrict?: boolean
|
|
412
415
|
/** F-CTX-1: jendela konteks yang dipakai footer TUI (window %) — flag --context-window. */
|
|
413
416
|
contextWindowTokens?: number
|
|
417
|
+
/** Jendela dinamis mengikuti model yang dipilih saat sesi berjalan. */
|
|
418
|
+
getContextWindowTokens?: () => number
|
|
414
419
|
/** Flag opt-in local config sesi ini — dipakai perintah REPL (/sync,
|
|
415
420
|
* /provider, /model) agar konsisten dengan provider/tool yang aktif. */
|
|
416
421
|
allowLocalConfig: boolean
|
|
@@ -899,7 +904,7 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
899
904
|
runtimeMode,
|
|
900
905
|
adoptTask,
|
|
901
906
|
allowLocalConfig,
|
|
902
|
-
workMode = "
|
|
907
|
+
workMode = "DISCUSS",
|
|
903
908
|
workModeExplicit = false,
|
|
904
909
|
maxSteps,
|
|
905
910
|
contextWindowTokens,
|
|
@@ -977,21 +982,21 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
977
982
|
)
|
|
978
983
|
}
|
|
979
984
|
// P0.2 (Q5): saat `--resume` tanpa sinyal WorkMode eksplisit, pulihkan
|
|
980
|
-
// WorkMode tersimpan dari metadata sesi (NULL legacy → default
|
|
985
|
+
// WorkMode tersimpan dari metadata sesi (NULL legacy → default DISCUSS).
|
|
981
986
|
//
|
|
982
987
|
// [mode-architecture] --plan = alias warisan WorkMode PLAN (bukan permission
|
|
983
988
|
// mode). Dilipat di sini (satu titik untuk semua pemanggil: index/exec/acp).
|
|
984
989
|
const persistedWorkMode = identity.resumed ? loadSessionWorkMode(sessionId, cwd) : undefined
|
|
985
990
|
const planAsWorkMode =
|
|
986
|
-
plan && !workModeExplicit && workMode === "
|
|
987
|
-
if (plan && !workModeExplicit && workMode === "
|
|
991
|
+
plan && !workModeExplicit && workMode === "DISCUSS" ? ("PLAN" as const) : workMode
|
|
992
|
+
if (plan && !workModeExplicit && workMode === "DISCUSS") {
|
|
988
993
|
process.stderr.write(
|
|
989
994
|
`${c.dim("[deprecated] --plan is now WorkMode PLAN; use --work-mode PLAN\n")}`,
|
|
990
995
|
)
|
|
991
996
|
}
|
|
992
997
|
const effectiveWorkMode: "DISCUSS" | "PLAN" | "EXECUTE" =
|
|
993
998
|
identity.resumed && !workModeExplicit && !plan
|
|
994
|
-
? (persistedWorkMode ?? "
|
|
999
|
+
? (persistedWorkMode ?? "DISCUSS")
|
|
995
1000
|
: planAsWorkMode
|
|
996
1001
|
// P0.2 (Q4): tolak startup (fail-closed) bila `--verify` digabung dengan
|
|
997
1002
|
// WorkMode DISCUSS atau PLAN (baik dari flag/env maupun pulihan `--resume`).
|
|
@@ -1122,40 +1127,28 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1122
1127
|
if (!Number.isFinite(effectiveTimeoutMs) || effectiveTimeoutMs < 0) {
|
|
1123
1128
|
process.stderr.write(`[warn] invalid timeout ${effectiveTimeoutMs}, fallback to 900000\n`)
|
|
1124
1129
|
effectiveTimeoutMs = 900_000
|
|
1130
|
+
} else if (effectiveTimeoutMs > LIMITS.MAX_TIMER_DELAY_MS) {
|
|
1131
|
+
process.stderr.write(
|
|
1132
|
+
`[warn] timeout exceeds runtime limit; capped at ${LIMITS.MAX_TIMER_DELAY_MS}ms\n`,
|
|
1133
|
+
)
|
|
1134
|
+
effectiveTimeoutMs = LIMITS.MAX_TIMER_DELAY_MS
|
|
1135
|
+
}
|
|
1136
|
+
// `--timeout` adalah deadline satu pemanggilan prompt. Jangan menyalakan
|
|
1137
|
+
// timer saat sesi dibuat: sesi TUI/REPL bisa idle lama lalu menerima prompt
|
|
1138
|
+
// baru, yang harus mendapat jatah waktu baru.
|
|
1139
|
+
const createRunDeadline = () => {
|
|
1140
|
+
if (effectiveTimeoutMs === 0 || effectiveTimeoutMs === Infinity)
|
|
1141
|
+
return { signal: undefined, cancel: () => {} }
|
|
1142
|
+
const controller = new AbortController()
|
|
1143
|
+
const timer = setTimeout(
|
|
1144
|
+
() =>
|
|
1145
|
+
controller.abort(
|
|
1146
|
+
new AgentError("timeout", `run exceeded wall-clock timeout (${effectiveTimeoutMs}ms)`),
|
|
1147
|
+
),
|
|
1148
|
+
effectiveTimeoutMs,
|
|
1149
|
+
)
|
|
1150
|
+
return { signal: controller.signal, cancel: () => clearTimeout(timer) }
|
|
1125
1151
|
}
|
|
1126
|
-
// [Fase 7 / Live #3] ROOT wall-clock timeout. Sebelumnya `--timeout` hanya
|
|
1127
|
-
// dioper ke kernel turn (session.timeoutMs), sehingga setup/retry di luar
|
|
1128
|
-
// turn (DB init, system prompt, provider connect) tidak diikat satu
|
|
1129
|
-
// deadline — uji live: `--timeout 30000` selesai di TOTAL_MS=71967 karena
|
|
1130
|
-
// ~42 dtk setup berada di luar pagar. Signal root ini dibuat di sini
|
|
1131
|
-
// (sebelum setup) dan di-compose ke sinyal turn + diperiksa selama setup,
|
|
1132
|
-
// jadi TOTAL_MS benar-benar menghormati batas pengguna.
|
|
1133
|
-
// [Fase 10 / QF] `AbortSignal.timeout()` menembak dengan reason DOMException
|
|
1134
|
-
// (bukan AgentError). `abortError()` kernel lalu mengklasifikasikannya sebagai
|
|
1135
|
-
// "aborted" generik — bukan "timeout" — sehingga `--timeout` yang fire di
|
|
1136
|
-
// tengah provider menggantung melaporkan "Run was aborted" alih-alih
|
|
1137
|
-
// "Run exceeded timeout". Kita buat controller sendiri supaya reason-nya
|
|
1138
|
-
// AgentError("timeout") → kernel mempertahankan identitas timeout.
|
|
1139
|
-
const rootTimeoutSignal =
|
|
1140
|
-
effectiveTimeoutMs === Infinity || effectiveTimeoutMs === 0
|
|
1141
|
-
? undefined
|
|
1142
|
-
: (() => {
|
|
1143
|
-
const rc = new AbortController()
|
|
1144
|
-
const timer = setTimeout(
|
|
1145
|
-
() =>
|
|
1146
|
-
rc.abort(
|
|
1147
|
-
new AgentError(
|
|
1148
|
-
"timeout",
|
|
1149
|
-
`run exceeded root wall-clock timeout (${effectiveTimeoutMs}ms)`,
|
|
1150
|
-
),
|
|
1151
|
-
),
|
|
1152
|
-
effectiveTimeoutMs,
|
|
1153
|
-
)
|
|
1154
|
-
try {
|
|
1155
|
-
;(timer as unknown as { unref?: () => void })?.unref?.()
|
|
1156
|
-
} catch {}
|
|
1157
|
-
return rc.signal
|
|
1158
|
-
})()
|
|
1159
1152
|
|
|
1160
1153
|
// [mode-architecture] `--plan` legacy bukan lagi permission mode — pemetaannya
|
|
1161
1154
|
// ke WorkMode PLAN terjadi di effectiveWorkMode (di atas). Sisa profil warisan
|
|
@@ -1218,6 +1211,35 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1218
1211
|
modelRef.current = saved
|
|
1219
1212
|
}
|
|
1220
1213
|
}
|
|
1214
|
+
const effectiveDefaultModel = () => modelRef.current ?? cfg.providers[0]?.models[0]
|
|
1215
|
+
const warnedContextModels = new Set<string>()
|
|
1216
|
+
const routedContextModel = (model?: string) =>
|
|
1217
|
+
router.contextModelIdentity(model ?? effectiveDefaultModel()) ?? model ?? "default"
|
|
1218
|
+
const contextModelId = (requested?: string): string => {
|
|
1219
|
+
return routedContextModel(requested)
|
|
1220
|
+
}
|
|
1221
|
+
const getContextWindowTokens = (model?: string) => {
|
|
1222
|
+
const resolved = resolveContextWindow(cfg, routedContextModel(model), contextWindowTokens)
|
|
1223
|
+
if (resolved.source === "safe-default") {
|
|
1224
|
+
const key = resolved.providerId
|
|
1225
|
+
? `${resolved.providerId}::${resolved.model ?? "default"}`
|
|
1226
|
+
: (resolved.model ?? "default")
|
|
1227
|
+
if (!warnedContextModels.has(key)) {
|
|
1228
|
+
warnedContextModels.add(key)
|
|
1229
|
+
process.stderr.write(
|
|
1230
|
+
`${c.yellow(`[context] no configured window for ${sanitizeAnsi(key)}; using fallback ${resolved.tokens} tokens. Set provider.contextWindows or --context-window for the exact limit.\n`)}`,
|
|
1231
|
+
)
|
|
1232
|
+
}
|
|
1233
|
+
}
|
|
1234
|
+
return resolved.tokens
|
|
1235
|
+
}
|
|
1236
|
+
const getReportedContextWindowTokens = (model?: string) => {
|
|
1237
|
+
const resolved = resolveContextWindow(cfg, routedContextModel(model), contextWindowTokens)
|
|
1238
|
+
return resolved.source === "safe-default" ? undefined : resolved.tokens
|
|
1239
|
+
}
|
|
1240
|
+
router.updateContextWindowResolver(getContextWindowTokens)
|
|
1241
|
+
// Emit the fallback warning immediately for the startup-selected model.
|
|
1242
|
+
getContextWindowTokens()
|
|
1221
1243
|
const {
|
|
1222
1244
|
systemExtra,
|
|
1223
1245
|
skills: allLoadedSkills,
|
|
@@ -1269,14 +1291,14 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1269
1291
|
if (identity.resumed) {
|
|
1270
1292
|
// P0.2 (Q5 / Invariant #6) — transparansi resume: WorkMode dipulihkan dari
|
|
1271
1293
|
// metadata sesi bila operator tidak memberi sinyal eksplisit (NULL legacy
|
|
1272
|
-
// kembali ke default
|
|
1294
|
+
// kembali ke default DISCUSS). Satu baris stderr human-facing memastikan
|
|
1273
1295
|
// otoritas sesi hasil resume selalu terlihat eksplisit.
|
|
1274
1296
|
const resumeNotice = !workModeExplicit
|
|
1275
1297
|
? persistedWorkMode !== undefined
|
|
1276
|
-
? `[resume] WorkMode ${effectiveWorkMode} restored from session; pass --work-mode DISCUSS|PLAN|
|
|
1277
|
-
: `[resume] WorkMode default
|
|
1298
|
+
? `[resume] WorkMode ${effectiveWorkMode === "EXECUTE" ? "BUILD" : effectiveWorkMode} restored from session; pass --work-mode DISCUSS|PLAN|BUILD to override\n`
|
|
1299
|
+
: `[resume] WorkMode default DISCUSS (legacy session without saved workMode); pass --work-mode PLAN|BUILD to change\n`
|
|
1278
1300
|
: persistedWorkMode !== undefined && persistedWorkMode !== effectiveWorkMode
|
|
1279
|
-
? `[resume] WorkMode ${effectiveWorkMode} (overriding saved ${persistedWorkMode})\n`
|
|
1301
|
+
? `[resume] WorkMode ${effectiveWorkMode === "EXECUTE" ? "BUILD" : effectiveWorkMode} (overriding saved ${persistedWorkMode === "EXECUTE" ? "BUILD" : persistedWorkMode})\n`
|
|
1280
1302
|
: ""
|
|
1281
1303
|
if (resumeNotice) process.stderr.write(resumeNotice)
|
|
1282
1304
|
// P2.4: aktivasi default Thread SEBELUM seed kernel — backfill aditif
|
|
@@ -1333,8 +1355,9 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1333
1355
|
// ContextSelection provenance-bound. P2.8 dipakai sebagai sumber
|
|
1334
1356
|
// keputusan proyeksi + fallback identik; selector MEMPERLUAS dengan
|
|
1335
1357
|
// budget-tail + laporan selectionBasis/freshness. Tak ada tulis kanonik.
|
|
1336
|
-
//
|
|
1337
|
-
//
|
|
1358
|
+
// Batasi histori resume ke batas model, tanpa mengarang overhead.
|
|
1359
|
+
// Kernel menghitung system+tools aktual dan memadatkan sebelum request;
|
|
1360
|
+
// selector hanya membuang ke budget-tail bila pesan sendiri tak muat.
|
|
1338
1361
|
const durableEvents = loadPresentationEvents(sessionId, cwd)
|
|
1339
1362
|
const revision = countDurableCompactions(durableEvents as readonly { type: string }[])
|
|
1340
1363
|
const rowsForSelector = loadThreadHistoryWithSeq(sessionId, defaultThread.thread_id, cwd)
|
|
@@ -1352,10 +1375,8 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1352
1375
|
(view.source === "projection" && view.summary
|
|
1353
1376
|
? { baseSeq: view.coveredSeq, summaryText: view.summary }
|
|
1354
1377
|
: undefined)
|
|
1355
|
-
const
|
|
1356
|
-
|
|
1357
|
-
? contextWindowTokens
|
|
1358
|
-
: Number.MAX_SAFE_INTEGER
|
|
1378
|
+
const selectedWindow = getContextWindowTokens()
|
|
1379
|
+
const messageBudget = selectedWindow
|
|
1359
1380
|
// N1: turunkan frontier kanonis dari baris yang BARU DIBACA (sumber
|
|
1360
1381
|
// kebenaran saat ini) dan teruskan ke selector — freshness dihitung
|
|
1361
1382
|
// via assessContextFreshness (BUKAN hard-code "fresh"). Selector tetap
|
|
@@ -1373,7 +1394,7 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1373
1394
|
rows: selectorRows,
|
|
1374
1395
|
revision,
|
|
1375
1396
|
...(projectionSummary ? { projection: projectionSummary } : {}),
|
|
1376
|
-
policy: { budgetTokens: messageBudget },
|
|
1397
|
+
policy: { budgetTokens: messageBudget, estimator: minicodeEstimator },
|
|
1377
1398
|
canonicalFrontier,
|
|
1378
1399
|
})
|
|
1379
1400
|
initialMessages = selection.messages as readonly Message[]
|
|
@@ -1766,31 +1787,31 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1766
1787
|
} catch {}
|
|
1767
1788
|
}
|
|
1768
1789
|
}
|
|
1769
|
-
const compaction =
|
|
1770
|
-
?
|
|
1771
|
-
|
|
1772
|
-
|
|
1773
|
-
|
|
1774
|
-
|
|
1775
|
-
|
|
1776
|
-
|
|
1777
|
-
|
|
1778
|
-
|
|
1779
|
-
|
|
1780
|
-
|
|
1781
|
-
|
|
1782
|
-
|
|
1783
|
-
|
|
1784
|
-
|
|
1785
|
-
|
|
1786
|
-
|
|
1787
|
-
|
|
1788
|
-
|
|
1789
|
-
|
|
1790
|
-
|
|
1791
|
-
|
|
1792
|
-
|
|
1793
|
-
|
|
1790
|
+
const compaction = createLlmCompaction({
|
|
1791
|
+
...(process.env.DEEPSEEK_API_KEY ? { apiKey: process.env.DEEPSEEK_API_KEY } : {}),
|
|
1792
|
+
baseUrl: process.env.DEEPSEEK_BASE_URL ?? "https://api.deepseek.com/v1",
|
|
1793
|
+
model: "deepseek-chat",
|
|
1794
|
+
cwd: cwd ?? process.cwd(),
|
|
1795
|
+
getContextWindowTokens,
|
|
1796
|
+
onUsage: (u) => {
|
|
1797
|
+
try {
|
|
1798
|
+
// Angka sudah dinormalisasi di compactWithLlm (negatif/NaN → skip).
|
|
1799
|
+
sessionEvents?.emit({
|
|
1800
|
+
type: "provider:extension",
|
|
1801
|
+
kind: "usage",
|
|
1802
|
+
data: {
|
|
1803
|
+
inputTokens: u.inputTokens,
|
|
1804
|
+
outputTokens: u.outputTokens,
|
|
1805
|
+
totalTokens: u.totalTokens,
|
|
1806
|
+
source: "compaction",
|
|
1807
|
+
// P1.4: atribusi biaya compaction memakai model yang benar-benar
|
|
1808
|
+
// dipakai (deepseek-chat), bukan model utama sesi.
|
|
1809
|
+
model: "deepseek-chat",
|
|
1810
|
+
},
|
|
1811
|
+
})
|
|
1812
|
+
} catch {}
|
|
1813
|
+
},
|
|
1814
|
+
})
|
|
1794
1815
|
const {
|
|
1795
1816
|
sessionTools,
|
|
1796
1817
|
evidenceMode,
|
|
@@ -1833,6 +1854,7 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1833
1854
|
setSubAgentParentRouting({
|
|
1834
1855
|
...(rateLimiter ? { rateLimiter } : {}),
|
|
1835
1856
|
...(providerOverride ? { defaultProviderId: providerOverride } : {}),
|
|
1857
|
+
contextWindowTokensForModel: getContextWindowTokens,
|
|
1836
1858
|
})
|
|
1837
1859
|
// P2.9 — lineage parent Run untuk anak Sub-Agent. Composition root satu-
|
|
1838
1860
|
//-satunya pemilik Run hidup; tooltak pernah mengarang id ini (vendor
|
|
@@ -1880,6 +1902,9 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1880
1902
|
// dikompaksi; tidak pernah masuk histori kanonik. Absen = perilaku lama.
|
|
1881
1903
|
systemExtra: `${runtimeStateHeader ? `${runtimeStateHeader}\n\n` : ""}${systemExtra ?? ""}${recoveryAppendix}`,
|
|
1882
1904
|
model: modelRef.current,
|
|
1905
|
+
getContextModel: () => contextModelId(modelRef.current),
|
|
1906
|
+
contextWindowTokens: getContextWindowTokens(),
|
|
1907
|
+
contextWindowTokensForModel: getContextWindowTokens,
|
|
1883
1908
|
// P13.6 — ask permission: composition root boleh menyuntik jalur headless
|
|
1884
1909
|
// (daemon → ApprovalBroker). Tanpa injeksi tetap prompt TTY; non-TTY ⇒
|
|
1885
1910
|
// deny (fail-closed), bukan izin diam-diam.
|
|
@@ -1928,7 +1953,6 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
1928
1953
|
noProgressDetector = detector
|
|
1929
1954
|
},
|
|
1930
1955
|
...(maxSteps ? { maxSteps } : {}),
|
|
1931
|
-
...(contextWindowTokens ? { contextWindowTokens } : {}),
|
|
1932
1956
|
...(keepRecentTurns ? { keepRecentTurns } : {}),
|
|
1933
1957
|
...(safeConcurrency ? { concurrency: safeConcurrency } : {}),
|
|
1934
1958
|
...(safeWriteConcurrency ? { writeConcurrency: safeWriteConcurrency } : {}),
|
|
@@ -2614,29 +2638,33 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
2614
2638
|
}
|
|
2615
2639
|
const previous = activeAgentSessionId
|
|
2616
2640
|
activeAgentSessionId = sessionId
|
|
2641
|
+
const deadline = createRunDeadline()
|
|
2642
|
+
const runSignal = deadline.signal
|
|
2643
|
+
? signal
|
|
2644
|
+
? AbortSignal.any([signal, deadline.signal])
|
|
2645
|
+
: deadline.signal
|
|
2646
|
+
: signal
|
|
2617
2647
|
try {
|
|
2618
|
-
return await runPromptWithVerifyImpl(p,
|
|
2648
|
+
return await runPromptWithVerifyImpl(p, runSignal)
|
|
2619
2649
|
} finally {
|
|
2650
|
+
deadline.cancel()
|
|
2620
2651
|
if (activeAgentSessionId === sessionId) activeAgentSessionId = previous ?? null
|
|
2621
2652
|
}
|
|
2622
2653
|
}
|
|
2623
2654
|
|
|
2624
2655
|
async function runPromptWithVerifyImpl(p: string, signal?: AbortSignal): Promise<void> {
|
|
2625
|
-
|
|
2626
|
-
|
|
2627
|
-
|
|
2628
|
-
|
|
2629
|
-
|
|
2630
|
-
|
|
2631
|
-
|
|
2656
|
+
if (signal?.aborted) {
|
|
2657
|
+
const reason = signal.reason
|
|
2658
|
+
if ((reason as { kind?: unknown } | undefined)?.kind === "timeout") {
|
|
2659
|
+
const message = reason instanceof Error ? reason.message : "run exceeded wall-clock timeout"
|
|
2660
|
+
process.stderr.write(`[timeout] ${message}\n`)
|
|
2661
|
+
throw reason
|
|
2662
|
+
}
|
|
2663
|
+
throw new AgentError("aborted", "turn aborted", { cause: reason })
|
|
2632
2664
|
}
|
|
2633
|
-
//
|
|
2634
|
-
//
|
|
2635
|
-
const composedSignal =
|
|
2636
|
-
? signal
|
|
2637
|
-
? AbortSignal.any([signal, rootTimeoutSignal])
|
|
2638
|
-
: rootTimeoutSignal
|
|
2639
|
-
: signal
|
|
2665
|
+
// Sinyal per-prompt berlaku pada persiapan turn, provider retry, tool, dan
|
|
2666
|
+
// verify. Kernel memiliki timeout lapis kedua khusus eksekusi model.
|
|
2667
|
+
const composedSignal = signal
|
|
2640
2668
|
// P2.2: pagar pra-turn (lihat ensureWriterFresh). Basi → turn dilewati
|
|
2641
2669
|
// sebelum provider dibelanjakan; histori tak tersentuh.
|
|
2642
2670
|
if (!ensureWriterFresh()) return
|
|
@@ -2728,7 +2756,7 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
2728
2756
|
// Occupancy konteks (bukan spend sesi) — budget cutoff adalah
|
|
2729
2757
|
// peristiwa berbeda; field tetap konsisten dengan meter context.
|
|
2730
2758
|
usedTokens: session.contextTokens,
|
|
2731
|
-
windowTokens:
|
|
2759
|
+
windowTokens: getContextWindowTokens(),
|
|
2732
2760
|
turnId: session.state.turnCount,
|
|
2733
2761
|
})
|
|
2734
2762
|
process.stderr.write(
|
|
@@ -2748,48 +2776,27 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
2748
2776
|
)
|
|
2749
2777
|
},
|
|
2750
2778
|
})
|
|
2751
|
-
|
|
2752
|
-
|
|
2753
|
-
|
|
2754
|
-
|
|
2755
|
-
|
|
2756
|
-
|
|
2757
|
-
|
|
2758
|
-
|
|
2759
|
-
|
|
2760
|
-
|
|
2761
|
-
|
|
2762
|
-
|
|
2763
|
-
|
|
2764
|
-
|
|
2765
|
-
|
|
2766
|
-
|
|
2767
|
-
|
|
2768
|
-
|
|
2769
|
-
|
|
2770
|
-
|
|
2771
|
-
|
|
2772
|
-
percent: windowTokens > 0 ? Math.min(100, (occupancy / windowTokens) * 100) : undefined,
|
|
2773
|
-
costUsd: usage.getSession().cost,
|
|
2774
|
-
turnId: session.state.turnCount,
|
|
2775
|
-
})
|
|
2776
|
-
// F-CTX-2: pemotongan mi-stream yang durable → masuk transkrip.
|
|
2777
|
-
presentation?.noteContextCutoff({
|
|
2778
|
-
reason: `context window exceeded: output ${actual} > allowance ${allowed} (window ${windowTokens})`,
|
|
2779
|
-
usedTokens: actual,
|
|
2780
|
-
windowTokens,
|
|
2781
|
-
turnId: session.state.turnCount,
|
|
2782
|
-
})
|
|
2783
|
-
process.stderr.write(
|
|
2784
|
-
`[context] stream truncated: context-window limit reached (output ${actual} > allowance ${allowed} of window ${contextWindowTokens})\n`,
|
|
2785
|
-
)
|
|
2786
|
-
ctl.abort(
|
|
2787
|
-
new AgentError(
|
|
2788
|
-
"budget_exceeded",
|
|
2789
|
-
`context window exceeded: output ${actual} > allowance ${allowed} (window ${contextWindowTokens})`,
|
|
2790
|
-
),
|
|
2791
|
-
)
|
|
2792
|
-
},
|
|
2779
|
+
const stopContextGuard = session.events.on("provider:extension", (event) => {
|
|
2780
|
+
if (event.kind !== "context-window-limit") return
|
|
2781
|
+
const data = event.data as
|
|
2782
|
+
| { inputTokens?: unknown; outputTokens?: unknown; windowTokens?: unknown }
|
|
2783
|
+
| undefined
|
|
2784
|
+
const input = typeof data?.inputTokens === "number" ? data.inputTokens : 0
|
|
2785
|
+
const output = typeof data?.outputTokens === "number" ? data.outputTokens : 0
|
|
2786
|
+
const windowTokens =
|
|
2787
|
+
typeof data?.windowTokens === "number" && data.windowTokens > 0
|
|
2788
|
+
? data.windowTokens
|
|
2789
|
+
: getContextWindowTokens()
|
|
2790
|
+
const usedTokens = input + output
|
|
2791
|
+
presentation?.noteContextCutoff({
|
|
2792
|
+
reason: `context guard stopped request: input ${input} + output ${output} (window ${windowTokens})`,
|
|
2793
|
+
usedTokens,
|
|
2794
|
+
windowTokens,
|
|
2795
|
+
turnId: session.state.turnCount,
|
|
2796
|
+
})
|
|
2797
|
+
process.stderr.write(
|
|
2798
|
+
`[context] request stopped at context budget: input ${input} + output ${output} (window ${windowTokens}).\n`,
|
|
2799
|
+
)
|
|
2793
2800
|
})
|
|
2794
2801
|
try {
|
|
2795
2802
|
try {
|
|
@@ -2826,7 +2833,7 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
2826
2833
|
}
|
|
2827
2834
|
} finally {
|
|
2828
2835
|
stopWatch()
|
|
2829
|
-
|
|
2836
|
+
stopContextGuard()
|
|
2830
2837
|
if (s) s.removeEventListener("abort", onParentAbort)
|
|
2831
2838
|
turnStatus?.endTurn()
|
|
2832
2839
|
}
|
|
@@ -3237,11 +3244,25 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
3237
3244
|
// uses — so autonomous work does not run a different model or a weaker
|
|
3238
3245
|
// tool stack than the interactive session.
|
|
3239
3246
|
sessionFactory: async (spec: AutonomousSessionSpec) => {
|
|
3247
|
+
const childProvider = spec.provider as {
|
|
3248
|
+
contextWindowTokensForModel?: (model?: string) => number
|
|
3249
|
+
contextModelIdentity?: (model?: string) => string | undefined
|
|
3250
|
+
}
|
|
3251
|
+
const contextWindowTokensForModel = childProvider.contextWindowTokensForModel
|
|
3240
3252
|
const child = await createMinicodeSession({
|
|
3241
3253
|
provider: spec.provider as never,
|
|
3242
3254
|
tools: spec.tools as never,
|
|
3243
3255
|
cwd: spec.cwd,
|
|
3244
3256
|
systemExtra: spec.systemExtra,
|
|
3257
|
+
model: spec.model,
|
|
3258
|
+
...(contextWindowTokensForModel
|
|
3259
|
+
? {
|
|
3260
|
+
contextWindowTokens: contextWindowTokensForModel(spec.model),
|
|
3261
|
+
contextWindowTokensForModel,
|
|
3262
|
+
getContextModel: () =>
|
|
3263
|
+
childProvider.contextModelIdentity?.(spec.model) ?? spec.model,
|
|
3264
|
+
}
|
|
3265
|
+
: {}),
|
|
3245
3266
|
// [PHASE 6U] The child conversation id is NOT a kernel config field.
|
|
3246
3267
|
timeoutMs: spec.timeoutMs,
|
|
3247
3268
|
// [PHASE 6U][SECURITY] The 6S handler, not a `readonly` MODE. This
|
|
@@ -3558,7 +3579,10 @@ export async function createCliSession(opts: CliSessionOptions): Promise<CliSess
|
|
|
3558
3579
|
usage,
|
|
3559
3580
|
budget,
|
|
3560
3581
|
budgetStrict,
|
|
3561
|
-
contextWindowTokens
|
|
3582
|
+
get contextWindowTokens() {
|
|
3583
|
+
return getReportedContextWindowTokens()
|
|
3584
|
+
},
|
|
3585
|
+
getContextWindowTokens: () => getContextWindowTokens(),
|
|
3562
3586
|
memoryHits,
|
|
3563
3587
|
detachSimple: () => detachUI(),
|
|
3564
3588
|
// [Area A · PROMPT 06] State UI sesi ini (lihat interface CliSession).
|