minicode-ai 0.11.0 → 0.13.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/CHANGELOG.md +98 -0
- package/LICENSE +21 -21
- package/README.md +4 -4
- package/cli/args.ts +46 -0
- package/cli/commands/acp.ts +163 -10
- package/cli/commands/config.ts +33 -18
- package/cli/commands/daemon.ts +515 -0
- package/cli/commands/exec.ts +145 -53
- package/cli/commands/openwork.ts +986 -0
- package/cli/commands/sessions.ts +4 -1
- package/cli/commands/stats.ts +34 -4
- package/cli/commands.ts +217 -2
- package/cli/index.ts +146 -14
- package/cli/recovery-warning.ts +115 -0
- package/cli/router.ts +32 -1
- package/cli/setup.ts +2332 -171
- package/cli/tui.ts +113 -7
- package/docs/OUTPUT_ARCHITECTURE_AUDIT.md +489 -0
- package/docs/OUTPUT_EVENT_MODEL.md +289 -0
- package/docs/OUTPUT_IMPLEMENTATION_PLAN.md +391 -0
- package/docs/OUTPUT_PROTOCOL_SPEC.md +285 -0
- package/docs/OUTPUT_RENDERING_SPEC.md +248 -0
- package/docs/OUTPUT_UX_RULES.md +449 -0
- package/docs/PLAN_UIUX_V6.md +2 -2
- package/docs/README.md +4 -3
- package/docs/TERMINAL_CONTRACT.md +278 -66
- package/docs/architecture.md +89 -7
- package/docs/changelog.md +1 -1
- package/docs/choosing-mode.md +2 -2
- package/docs/cli.md +9 -5
- package/docs/concepts.md +1 -1
- package/docs/contributing.md +9 -2
- package/docs/environment.md +6 -2
- package/docs/exec.md +46 -5
- package/docs/memory-sessions.md +2 -0
- package/docs/policy-sandbox.md +1 -1
- package/docs/pricing-budget.md +1 -1
- package/docs/quickstart.md +2 -2
- package/docs/repl.md +6 -2
- package/docs/security-model.md +1 -1
- package/docs/security.md +1 -1
- package/docs/skills.md +2 -2
- package/docs/terminal.md +9 -5
- package/docs/tools.md +1 -1
- package/package.json +35 -5
- package/src/app/session.ts +261 -15
- package/src/app/tool-layer.ts +94 -7
- package/src/daemon/approvals.ts +361 -0
- package/src/daemon/capability.ts +145 -0
- package/src/daemon/children.ts +142 -0
- package/src/daemon/client.ts +267 -0
- package/src/daemon/control.ts +350 -0
- package/src/daemon/discovery.ts +234 -0
- package/src/daemon/feed.ts +155 -0
- package/src/daemon/framing.ts +94 -0
- package/src/daemon/host.ts +316 -0
- package/src/daemon/protocol.ts +217 -0
- package/src/daemon/resource.ts +170 -0
- package/src/daemon/sanitize.ts +57 -0
- package/src/daemon/server.ts +627 -0
- package/src/daemon/store.ts +317 -0
- package/src/daemon/subscription.ts +270 -0
- package/src/daemon/telemetry.ts +81 -0
- package/src/hooks/run.ts +12 -1
- package/src/lib/atomic-write.ts +29 -3
- package/src/lib/db-path.ts +26 -0
- package/src/lib/keystore.ts +544 -42
- package/src/lib/net.ts +43 -1
- package/src/lib/safe-open.ts +116 -1
- package/src/lib/session-id.ts +15 -0
- package/src/lsp/client.ts +123 -5
- package/src/mcp/client.ts +139 -17
- package/src/mcp/server.ts +177 -50
- package/src/mcp/transport.ts +16 -19
- package/src/memory/vector.ts +770 -55
- package/src/policy/allowlist.ts +14 -2
- package/src/policy/bash-guard.ts +105 -10
- package/src/policy/compaction.ts +82 -5
- package/src/policy/consequence-engine.ts +220 -0
- package/src/policy/context.ts +132 -0
- package/src/policy/executor.ts +187 -121
- package/src/policy/no-progress.ts +559 -0
- package/src/policy/permission.ts +4 -8
- package/src/policy/pricing.ts +17 -3
- package/src/policy/scrub.ts +69 -2
- package/src/policy/tool-contract.ts +515 -0
- package/src/policy/usage.ts +310 -24
- package/src/policy/verifier.ts +6 -3
- package/src/policy/work-mode.ts +182 -0
- package/src/presentation/adapter.ts +533 -26
- package/src/presentation/events.ts +151 -0
- package/src/presentation/model.ts +180 -27
- package/src/presentation/projection.ts +858 -0
- package/src/presentation/reducer.ts +645 -310
- package/src/presentation/store.ts +12 -7
- package/src/providers/anthropic.ts +18 -10
- package/src/providers/responses.ts +17 -7
- package/src/runtime/capability.ts +409 -0
- package/src/runtime/child-execution.ts +274 -0
- package/src/runtime/composition.ts +958 -0
- package/src/runtime/dispatch.ts +591 -0
- package/src/runtime/execution-backend.ts +632 -0
- package/src/runtime/execution-events.ts +272 -0
- package/src/runtime/execution-id.ts +230 -0
- package/src/runtime/execution-journal.ts +926 -0
- package/src/runtime/execution-kernel.ts +456 -0
- package/src/runtime/execution-registry.ts +379 -0
- package/src/runtime/process-supervision.ts +276 -0
- package/src/runtime/production-execution.ts +551 -0
- package/src/runtime/production-runtime.ts +217 -0
- package/src/runtime/recovery-safety.ts +70 -0
- package/src/runtime/recovery.ts +477 -0
- package/src/runtime/runtime-capabilities.ts +179 -0
- package/src/runtime/runtime-diagnostics.ts +141 -0
- package/src/runtime/runtime-host.ts +365 -0
- package/src/runtime/runtime-status-facts.ts +222 -0
- package/src/runtime/runtime-status-provider.ts +74 -0
- package/src/runtime/runtime-status.ts +459 -0
- package/src/runtime/runtime-task-admission.ts +101 -0
- package/src/runtime/supervisor.ts +444 -0
- package/src/session/authority.ts +168 -0
- package/src/session/checkpoint.ts +88 -1
- package/src/session/context-adapter.ts +251 -0
- package/src/session/context-assembly.ts +242 -0
- package/src/session/context-identity.ts +389 -0
- package/src/session/context-projection.ts +248 -0
- package/src/session/context-selector.ts +500 -0
- package/src/session/cross-session-adoption.ts +249 -0
- package/src/session/full-history-fold.ts +171 -0
- package/src/session/identity.ts +192 -0
- package/src/session/journal.ts +805 -102
- package/src/session/open-work-intent.ts +732 -0
- package/src/session/open-work.ts +767 -0
- package/src/session/pending-tools.ts +94 -0
- package/src/session/persistence.ts +3569 -127
- package/src/session/runtime-header.ts +208 -0
- package/src/session/shadow-git.ts +13 -5
- package/src/session/verification.ts +1623 -0
- package/src/task/assignment.ts +136 -0
- package/src/task/autonomous-adapter.ts +168 -0
- package/src/task/autonomous-context.ts +630 -0
- package/src/task/autonomous-policy.ts +490 -0
- package/src/task/continuity.ts +179 -0
- package/src/task/execution-cancellation.ts +165 -0
- package/src/task/graph-validate.ts +379 -0
- package/src/task/graph.ts +305 -0
- package/src/task/identity.ts +230 -0
- package/src/task/model.ts +417 -0
- package/src/task/production-scheduler.ts +293 -0
- package/src/task/readiness.ts +229 -0
- package/src/task/scheduler-observability.ts +387 -0
- package/src/task/scheduler.ts +1197 -0
- package/src/task/scheduling-policy.ts +165 -0
- package/src/task/session-authority.ts +148 -0
- package/src/task/session-ownership.ts +211 -0
- package/src/task/store.ts +2887 -0
- package/src/task/sync.ts +343 -0
- package/src/task/trigger.ts +260 -0
- package/src/tools/bash.ts +377 -211
- package/src/tools/code_run.ts +1 -1
- package/src/tools/delete_file.ts +1 -1
- package/src/tools/edit.ts +33 -6
- package/src/tools/evidence.ts +30 -0
- package/src/tools/git.ts +4 -4
- package/src/tools/glob.ts +12 -3
- package/src/tools/grep.ts +1 -1
- package/src/tools/lsp.ts +4 -4
- package/src/tools/mcp_call.ts +11 -4
- package/src/tools/memory.ts +153 -18
- package/src/tools/move_file.ts +1 -1
- package/src/tools/patch.ts +1 -1
- package/src/tools/read_file.ts +1 -1
- package/src/tools/read_image.ts +1 -1
- package/src/tools/submit_result.ts +1 -1
- package/src/tools/task.ts +437 -41
- package/src/tools/todo.ts +662 -35
- package/src/tools/web_fetch.ts +4 -2
- package/src/tools/web_search.ts +9 -3
- package/src/tools/write_file.ts +1 -1
- package/src/ui/assistant/simple.ts +123 -50
- package/src/ui/assistant/turn-status.ts +17 -3
- package/src/ui/contract.ts +184 -0
- package/src/ui/footer.ts +54 -18
- package/src/ui/i18n/en.ts +62 -6
- package/src/ui/i18n/id.ts +62 -6
- package/src/ui/input/prompt-engine.ts +120 -25
- package/src/ui/render/errors.ts +39 -1
- package/src/ui/render/markdown-table.ts +455 -0
- package/src/ui/render/markdown.ts +22 -1
- package/src/ui/render/table-grid.ts +184 -0
- package/src/ui/render/table.ts +15 -76
- package/src/ui/runtime/screen.ts +7 -2
- package/src/ui/runtime/statusline.ts +25 -6
- package/src/ui/tui/app.ts +598 -133
- package/src/ui/tui/transcript.ts +531 -89
- package/vendor/minicore/VENDOR.md +1 -1
- package/vendor/minicore/src/core/budget.ts +25 -25
- package/vendor/minicore/src/core/compact.ts +75 -75
- package/vendor/minicore/src/core/errors.ts +59 -59
- package/vendor/minicore/src/core/events.ts +73 -73
- package/vendor/minicore/src/core/executor.ts +139 -139
- package/vendor/minicore/src/core/history.ts +31 -31
- package/vendor/minicore/src/core/index.ts +41 -41
- package/vendor/minicore/src/core/loop.ts +355 -355
- package/vendor/minicore/src/core/permission.ts +22 -22
- package/vendor/minicore/src/core/provider.ts +39 -39
- package/vendor/minicore/src/core/recovery.ts +35 -35
- package/vendor/minicore/src/core/session.ts +327 -327
- package/vendor/minicore/src/core/snapshot.ts +146 -146
- package/vendor/minicore/src/core/tokens.ts +107 -107
- package/vendor/minicore/src/core/tool.ts +115 -115
- package/vendor/minicore/src/core/types.ts +50 -50
- package/vendor/minicore/src/providers/openai-compat.ts +417 -417
- package/AGENTS.md +0 -45
- package/PLAN.md +0 -491
- package/docs/ARCHITECTURE.html +0 -1248
- package/docs/CONTROL-PLANE-MAP.md +0 -139
- package/docs/HARNESS.md +0 -150
- package/docs/SUMMARY.md +0 -52
- package/docs/UI_RENDER_PIPELINE.md +0 -165
- package/docs/USAGE.md +0 -11
package/src/policy/usage.ts
CHANGED
|
@@ -11,6 +11,21 @@ export interface Usage {
|
|
|
11
11
|
cost?: number
|
|
12
12
|
}
|
|
13
13
|
|
|
14
|
+
/**
|
|
15
|
+
* [Fase 3 / LOOP-INV-11] Seed akumulasi pemakaian dari turn/run sebelumnya pada
|
|
16
|
+
* sesi yang sama (mis. saat `--resume`), sehingga restart tidak me-reset budget
|
|
17
|
+
* sesi kembali ke nol.
|
|
18
|
+
*/
|
|
19
|
+
export interface UsageInitialSnapshot {
|
|
20
|
+
inputTokens?: number
|
|
21
|
+
outputTokens?: number
|
|
22
|
+
totalTokens?: number
|
|
23
|
+
cacheReadTokens?: number
|
|
24
|
+
cacheWriteTokens?: number
|
|
25
|
+
totalCostUsd?: number
|
|
26
|
+
turnCount?: number
|
|
27
|
+
}
|
|
28
|
+
|
|
14
29
|
// Tabel harga pindah ke src/policy/pricing.ts: bawaan (offline) + overlay
|
|
15
30
|
// opsional dari models.dev yang HANYA ditarik lewat `minicode pricing sync`.
|
|
16
31
|
// Overlay dimuat sekali per proses; sebelum termuat, tabel bawaan tetap dipakai
|
|
@@ -115,6 +130,33 @@ export function budgetExceededError(): Error {
|
|
|
115
130
|
return new AgentError("budget_exceeded", "budget exceeded")
|
|
116
131
|
}
|
|
117
132
|
|
|
133
|
+
/**
|
|
134
|
+
* [Fase 3 / LOOP-INV-11] Error batas keras `maxTurns` lintas resume.
|
|
135
|
+
* Memakai `AgentError("budget_exceeded", ...)` agar kernel frozen mempertahankan
|
|
136
|
+
* `kind: "budget_exceeded"` melewati `abortError`, ditambah properti `code`
|
|
137
|
+
* deterministik `"max_turns_exceeded"`.
|
|
138
|
+
*/
|
|
139
|
+
export function maxTurnsExceededError(
|
|
140
|
+
maxTurns: number,
|
|
141
|
+
turnCount?: number,
|
|
142
|
+
): AgentError & {
|
|
143
|
+
readonly code: "max_turns_exceeded"
|
|
144
|
+
} {
|
|
145
|
+
const err = new AgentError(
|
|
146
|
+
"budget_exceeded",
|
|
147
|
+
`max_turns_exceeded: turn count ${turnCount ?? maxTurns} reached limit ${maxTurns}`,
|
|
148
|
+
)
|
|
149
|
+
return Object.assign(err, { code: "max_turns_exceeded" as const })
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
export function turnBudgetStatus(
|
|
153
|
+
maxTurns: number | undefined,
|
|
154
|
+
turnCount: number,
|
|
155
|
+
): "ok" | "max-turns" {
|
|
156
|
+
if (maxTurns == null || !Number.isFinite(maxTurns) || maxTurns < 1) return "ok"
|
|
157
|
+
return turnCount >= Math.floor(maxTurns) ? "max-turns" : "ok"
|
|
158
|
+
}
|
|
159
|
+
|
|
118
160
|
/**
|
|
119
161
|
* Pemutus budget MID-TURN (audit 2026-09-16 M3).
|
|
120
162
|
*
|
|
@@ -134,15 +176,31 @@ export function watchBudgetLimit(opts: {
|
|
|
134
176
|
bus: EventBus
|
|
135
177
|
budget?: number
|
|
136
178
|
strict?: boolean
|
|
179
|
+
/** [Fase 3 / LOOP-INV-11] Batas keras jumlah turn lintas resume. */
|
|
180
|
+
maxTurns?: number
|
|
137
181
|
getCost: () => number | undefined
|
|
138
182
|
/** Total token sesi (untuk fail-closed unknown-cost, F-06). Default 0. */
|
|
139
183
|
getTokens?: () => number
|
|
140
|
-
|
|
184
|
+
/** Jumlah turn sesi saat ini (termasuk carry-forward resume). */
|
|
185
|
+
getTurns?: () => number
|
|
186
|
+
onOver: (status: "over" | "unknown-strict" | "max-turns", cost: number | undefined) => void
|
|
141
187
|
}): () => void {
|
|
142
|
-
|
|
188
|
+
const hasBudget = opts.budget != null
|
|
189
|
+
const hasMaxTurns = opts.maxTurns != null && Number.isFinite(opts.maxTurns) && opts.maxTurns >= 1
|
|
190
|
+
if (!hasBudget && !hasMaxTurns) return () => {}
|
|
143
191
|
let fired = false
|
|
192
|
+
const checkTurns = () => {
|
|
193
|
+
if (fired || !hasMaxTurns) return
|
|
194
|
+
const turns = opts.getTurns?.() ?? 0
|
|
195
|
+
if (turnBudgetStatus(opts.maxTurns, turns) !== "ok") {
|
|
196
|
+
fired = true
|
|
197
|
+
opts.onOver("max-turns", opts.getCost())
|
|
198
|
+
}
|
|
199
|
+
}
|
|
144
200
|
const check = () => {
|
|
145
201
|
if (fired) return
|
|
202
|
+
checkTurns()
|
|
203
|
+
if (fired || !hasBudget) return
|
|
146
204
|
const tokens = opts.getTokens?.() ?? 0
|
|
147
205
|
const st = budgetStatus(opts.budget, opts.getCost(), opts.strict ?? false, tokens)
|
|
148
206
|
if (st !== "ok") {
|
|
@@ -150,23 +208,72 @@ export function watchBudgetLimit(opts: {
|
|
|
150
208
|
opts.onOver(st, opts.getCost())
|
|
151
209
|
}
|
|
152
210
|
}
|
|
153
|
-
const
|
|
211
|
+
const offExt = opts.bus.on("provider:extension", (e) => {
|
|
154
212
|
if (e.kind === "usage" || e.kind === "effective-model") check()
|
|
155
213
|
})
|
|
214
|
+
const offTurn = hasMaxTurns
|
|
215
|
+
? opts.bus.on("turn:completed", () => {
|
|
216
|
+
checkTurns()
|
|
217
|
+
})
|
|
218
|
+
: null
|
|
219
|
+
checkTurns()
|
|
156
220
|
// Investigasi Phase 5 (E-3c): instant check saat pasang TIDAK boleh
|
|
157
221
|
// menggugurkan turn yang mulai dengan tokens==0 (belum ada pemakaian
|
|
158
222
|
// tercatat) di strict-mode — itu lockout total setiap prompt pertama.
|
|
159
223
|
// Gugur hanya bila sudah ada bukti belanja (tokens>0 + cost tak dikenal).
|
|
160
224
|
const tokensAtStart = opts.getTokens?.() ?? 0
|
|
161
|
-
if (tokensAtStart > 0) check()
|
|
225
|
+
if (!fired && hasBudget && tokensAtStart > 0) check()
|
|
162
226
|
return () => {
|
|
163
227
|
try {
|
|
164
|
-
|
|
228
|
+
offExt()
|
|
229
|
+
} catch {}
|
|
230
|
+
try {
|
|
231
|
+
offTurn?.()
|
|
165
232
|
} catch {}
|
|
166
233
|
}
|
|
167
234
|
}
|
|
168
235
|
|
|
169
|
-
export function
|
|
236
|
+
export function watchContextWindowLimit(opts: {
|
|
237
|
+
bus: EventBus
|
|
238
|
+
/** Batas window konteks (W). Bila 0/undefined → no-op. */
|
|
239
|
+
windowTokens: number
|
|
240
|
+
/** Estimasi token INPUT (pesan) pada sesi; output allowance = max(256, W - input). */
|
|
241
|
+
getInputTokens: () => number
|
|
242
|
+
/** Token output turn berjalan (dari usage collector). */
|
|
243
|
+
getOutputTokens: () => number
|
|
244
|
+
onOver: (allowed: number, actual: number) => void
|
|
245
|
+
}): () => void {
|
|
246
|
+
const W = opts.windowTokens
|
|
247
|
+
if (!Number.isFinite(W) || W <= 0) return () => {}
|
|
248
|
+
let fired = false
|
|
249
|
+
const check = () => {
|
|
250
|
+
if (fired) return
|
|
251
|
+
const input = opts.getInputTokens()
|
|
252
|
+
const allowedOutput = Math.max(256, Math.floor(W - input))
|
|
253
|
+
const output = opts.getOutputTokens()
|
|
254
|
+
if (output > allowedOutput) {
|
|
255
|
+
fired = true
|
|
256
|
+
opts.onOver(allowedOutput, output)
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
const offExt = opts.bus.on("provider:extension", (e) => {
|
|
260
|
+
if (e.kind === "usage") check()
|
|
261
|
+
})
|
|
262
|
+
check()
|
|
263
|
+
return () => {
|
|
264
|
+
try {
|
|
265
|
+
offExt()
|
|
266
|
+
} catch {}
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
export function createUsageCollector(
|
|
271
|
+
bus: EventBus,
|
|
272
|
+
model?: string,
|
|
273
|
+
initialSnapshot?: UsageInitialSnapshot,
|
|
274
|
+
) {
|
|
275
|
+
const cleanNonNeg = (n: number | undefined): number =>
|
|
276
|
+
typeof n === "number" && Number.isFinite(n) && n >= 0 ? n : 0
|
|
170
277
|
// DUA akumulator, bukan satu.
|
|
171
278
|
//
|
|
172
279
|
// `turn` di-reset setiap kali pemanggil menyimpan hasil satu turn
|
|
@@ -180,7 +287,20 @@ export function createUsageCollector(bus: EventBus, model?: string) {
|
|
|
180
287
|
// Tidak pernah di-assign ulang: field-nya yang diakumulasi. `turn` sebaliknya
|
|
181
288
|
// diganti objek baru oleh reset() supaya pemanggil yang menyimpan hasil lama
|
|
182
289
|
// tidak ikut ternol.
|
|
183
|
-
|
|
290
|
+
// [Fase 3 / LOOP-INV-11] Seed dengan pemakaian sesi sebelumnya bila ada.
|
|
291
|
+
const seedInput = cleanNonNeg(initialSnapshot?.inputTokens)
|
|
292
|
+
const seedOutput = cleanNonNeg(initialSnapshot?.outputTokens)
|
|
293
|
+
const seedTotal =
|
|
294
|
+
initialSnapshot?.totalTokens !== undefined
|
|
295
|
+
? Math.max(seedInput + seedOutput, cleanNonNeg(initialSnapshot.totalTokens))
|
|
296
|
+
: seedInput + seedOutput
|
|
297
|
+
const session: Usage = {
|
|
298
|
+
inputTokens: seedInput,
|
|
299
|
+
outputTokens: seedOutput,
|
|
300
|
+
totalTokens: seedTotal,
|
|
301
|
+
cacheReadTokens: cleanNonNeg(initialSnapshot?.cacheReadTokens),
|
|
302
|
+
cacheWriteTokens: cleanNonNeg(initialSnapshot?.cacheWriteTokens),
|
|
303
|
+
}
|
|
184
304
|
// cacheIncluded bisa beda per provider (Anthropic true, OpenAI false).
|
|
185
305
|
// Simpan per-event, akumulasi cost per segmen, bukan recompute dari total
|
|
186
306
|
// dengan flag global yang terakhir.
|
|
@@ -195,9 +315,142 @@ export function createUsageCollector(bus: EventBus, model?: string) {
|
|
|
195
315
|
// Akumulasi biaya per segmen (bukan recompute total dengan model terakhir)
|
|
196
316
|
// untuk sesi multi-model: gpt-4o-mini → claude-opus tidak di-reprice 100×.
|
|
197
317
|
let turnCost = 0
|
|
198
|
-
let sessionCost =
|
|
318
|
+
let sessionCost =
|
|
319
|
+
typeof initialSnapshot?.totalCostUsd === "number" &&
|
|
320
|
+
Number.isFinite(initialSnapshot.totalCostUsd) &&
|
|
321
|
+
initialSnapshot.totalCostUsd >= 0
|
|
322
|
+
? initialSnapshot.totalCostUsd
|
|
323
|
+
: 0
|
|
199
324
|
let turnHasCost = false
|
|
200
|
-
let sessionHasCost =
|
|
325
|
+
let sessionHasCost =
|
|
326
|
+
typeof initialSnapshot?.totalCostUsd === "number" &&
|
|
327
|
+
Number.isFinite(initialSnapshot.totalCostUsd) &&
|
|
328
|
+
initialSnapshot.totalCostUsd >= 0
|
|
329
|
+
let sessionTurns = Math.floor(cleanNonNeg(initialSnapshot?.turnCount))
|
|
330
|
+
let lastProviderUsage: { inputTokens: number; outputTokens: number; totalTokens: number } | null =
|
|
331
|
+
seedTotal > 0
|
|
332
|
+
? { inputTokens: seedInput, outputTokens: seedOutput, totalTokens: seedTotal }
|
|
333
|
+
: null
|
|
334
|
+
|
|
335
|
+
// [Fase 7 / Live #2] Batas-permintaan (request boundary) untuk akuntansi
|
|
336
|
+
// token streaming. Provider OpenAI-compat mengirim objek `usage` pada
|
|
337
|
+
// SETIAP chunk SSE yang membawa total kumulatif untuk permintaan itu
|
|
338
|
+
// (satu panggilan model = satu "step" kernel = satu `provider.complete()`).
|
|
339
|
+
// Sebelumnya `usage.ts` MENJUMLAHKAN (`+=`) setiap chunk → token inflasi
|
|
340
|
+
// ekstrem (uji live: balasan 1 kata "OK" tercatat tokens=142530; padahal
|
|
341
|
+
// token nyata ~50k).
|
|
342
|
+
//
|
|
343
|
+
// DESAIN (delta + overwrite): dalam SATU permintaan, snapshot usage tiap
|
|
344
|
+
// chunk bersifat KUMULATIF (chunk k punya total utuh permintaan itu, bukan
|
|
345
|
+
// tambahan per-chunk). Agar (a) nilai turn/session langsung terlihat oleh
|
|
346
|
+
// watcher budget tanpa menunggu batas step, dan (b) chunk berturut-turut
|
|
347
|
+
// TIDAK menjumlah, kita terapkan DELTA dari snapshot terakhir per-permintaan:
|
|
348
|
+
// - event usage PERTAMA untuk suatu permintaan: terapkan snapshot penuh
|
|
349
|
+
// - event usage BERIKUTNYA: terapkan selisih (snapshot_baru − snapshot_lama)
|
|
350
|
+
// Total bersih = snapshot TERAKHIR (overwrite), bukan penjumlahan chunk.
|
|
351
|
+
// Pada batas permintaan berikutnya (step:started/turn:started), baseline
|
|
352
|
+
// di-reset ke snapshot terakhir (yang sudah penuh terlihat).
|
|
353
|
+
let pendingRequestTokens: {
|
|
354
|
+
inputTokens: number
|
|
355
|
+
outputTokens: number
|
|
356
|
+
totalTokens: number
|
|
357
|
+
cacheReadTokens: number
|
|
358
|
+
cacheWriteTokens: number
|
|
359
|
+
cost: number | undefined
|
|
360
|
+
segModel: string | undefined
|
|
361
|
+
} | null = null
|
|
362
|
+
let requestBoundary = 0
|
|
363
|
+
// totalTokens permintaan yang sedang berjalan. Digunakan untuk mendeteksi
|
|
364
|
+
// MULAI permintaan BARU dalam satu step yang sama (mis. retry recovery
|
|
365
|
+
// kernel): total kumulatif streaming hanya bertambah dalam satu permintaan,
|
|
366
|
+
// jadi nilai yang MENURUN menandakan permintaan baru (bukan chunk lagi).
|
|
367
|
+
let lastRequestTotal = 0
|
|
368
|
+
|
|
369
|
+
// Terapkan snapshot ke turn+session. `prev` = snapshot permintaan yang sama
|
|
370
|
+
// sebelumnya (null untuk event pertama) — bila ada, hanya SELISIH yang
|
|
371
|
+
// diterapkan (delta), sehingga chunk kumulatif tidak menjumlah.
|
|
372
|
+
const applyPending = (
|
|
373
|
+
p: {
|
|
374
|
+
inputTokens: number
|
|
375
|
+
outputTokens: number
|
|
376
|
+
totalTokens: number
|
|
377
|
+
cacheReadTokens: number
|
|
378
|
+
cacheWriteTokens: number
|
|
379
|
+
cost: number | undefined
|
|
380
|
+
segModel: string | undefined
|
|
381
|
+
},
|
|
382
|
+
prev: typeof p | null,
|
|
383
|
+
): void => {
|
|
384
|
+
const dInput = Math.max(0, prev ? p.inputTokens - prev.inputTokens : p.inputTokens)
|
|
385
|
+
const dOutput = Math.max(0, prev ? p.outputTokens - prev.outputTokens : p.outputTokens)
|
|
386
|
+
const dTotal = Math.max(0, prev ? p.totalTokens - prev.totalTokens : p.totalTokens)
|
|
387
|
+
// [LF-3] Delta cache juga di-clamp ≥ 0: pemakaian terukur tak boleh berjalan
|
|
388
|
+
// mundur bila provider melaporkan snapshot yang lebih kecil dari sebelumnya.
|
|
389
|
+
const dRead = Math.max(0, prev ? p.cacheReadTokens - prev.cacheReadTokens : p.cacheReadTokens)
|
|
390
|
+
const dWrite = Math.max(
|
|
391
|
+
0,
|
|
392
|
+
prev ? p.cacheWriteTokens - prev.cacheWriteTokens : p.cacheWriteTokens,
|
|
393
|
+
)
|
|
394
|
+
turn.inputTokens += dInput
|
|
395
|
+
turn.outputTokens += dOutput
|
|
396
|
+
turn.totalTokens += dTotal
|
|
397
|
+
turn.cacheReadTokens = (turn.cacheReadTokens ?? 0) + dRead
|
|
398
|
+
turn.cacheWriteTokens = (turn.cacheWriteTokens ?? 0) + dWrite
|
|
399
|
+
session.inputTokens += dInput
|
|
400
|
+
session.outputTokens += dOutput
|
|
401
|
+
session.totalTokens += dTotal
|
|
402
|
+
session.cacheReadTokens = (session.cacheReadTokens ?? 0) + dRead
|
|
403
|
+
session.cacheWriteTokens = (session.cacheWriteTokens ?? 0) + dWrite
|
|
404
|
+
// Cost: hitung ulang dari snapshot TERAKHIR (delta cost = costBaru − costLama).
|
|
405
|
+
// costFor dipanggil per snapshot di handler; di sini cukup tambahkan delta
|
|
406
|
+
// cost bila keduanya terdefinisi. Untuk keandalan, kita simpan cost terakhir
|
|
407
|
+
// dan terapkan delta terhadap prev.cost.
|
|
408
|
+
const prevCost = prev?.cost
|
|
409
|
+
if (prevCost !== undefined && p.cost !== undefined) {
|
|
410
|
+
turnCost += p.cost - prevCost
|
|
411
|
+
sessionCost += p.cost - prevCost
|
|
412
|
+
turnHasCost = true
|
|
413
|
+
sessionHasCost = true
|
|
414
|
+
} else if (prevCost === undefined && p.cost !== undefined) {
|
|
415
|
+
turnCost += p.cost
|
|
416
|
+
sessionCost += p.cost
|
|
417
|
+
turnHasCost = true
|
|
418
|
+
sessionHasCost = true
|
|
419
|
+
}
|
|
420
|
+
}
|
|
421
|
+
|
|
422
|
+
// Komit permintaan yang sedang berjalan (baseline tetap pada snapshot
|
|
423
|
+
// terakhir yang sudah penuh terlihat — tidak ada tambahan lagi).
|
|
424
|
+
const flushPendingRequest = (): void => {
|
|
425
|
+
pendingRequestTokens = null
|
|
426
|
+
}
|
|
427
|
+
|
|
428
|
+
// Batas permintaan baru → komit snapshot lama, mulai baseline baru.
|
|
429
|
+
const beginRequest = (): void => {
|
|
430
|
+
flushPendingRequest()
|
|
431
|
+
requestBoundary += 1
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
try {
|
|
435
|
+
bus.on("turn:completed", () => {
|
|
436
|
+
sessionTurns += 1
|
|
437
|
+
// Selesaikan snapshot permintaan terakhir di turn ini.
|
|
438
|
+
flushPendingRequest()
|
|
439
|
+
})
|
|
440
|
+
} catch {}
|
|
441
|
+
|
|
442
|
+
try {
|
|
443
|
+
bus.on("turn:started", () => {
|
|
444
|
+
beginRequest()
|
|
445
|
+
})
|
|
446
|
+
} catch {}
|
|
447
|
+
|
|
448
|
+
try {
|
|
449
|
+
bus.on("step:started", () => {
|
|
450
|
+
// Setiap step kernel = satu panggilan provider = satu batas permintaan.
|
|
451
|
+
beginRequest()
|
|
452
|
+
})
|
|
453
|
+
} catch {}
|
|
201
454
|
|
|
202
455
|
bus.on("provider:extension", (e) => {
|
|
203
456
|
if (e.kind === "effective-model") {
|
|
@@ -232,24 +485,41 @@ export function createUsageCollector(bus: EventBus, model?: string) {
|
|
|
232
485
|
typeof d.cacheIncluded === "boolean" ? d.cacheIncluded : cacheIncluded
|
|
233
486
|
if (typeof d.cacheIncluded === "boolean") cacheIncluded = d.cacheIncluded
|
|
234
487
|
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
488
|
+
const reportedTotal =
|
|
489
|
+
typeof d.totalTokens === "number" && Number.isFinite(d.totalTokens) && d.totalTokens >= 0
|
|
490
|
+
? Math.max(input + output, d.totalTokens)
|
|
491
|
+
: input + output
|
|
492
|
+
lastProviderUsage = { inputTokens: input, outputTokens: output, totalTokens: reportedTotal }
|
|
493
|
+
|
|
494
|
+
// [Fase 7 / Live #2] JANGAN `+=` langsung ke turn+session per chunk SSE.
|
|
495
|
+
// Simpan ke snapshot permintaan yang sedang berjalan dan terapkan DELTA
|
|
496
|
+
// terhadap snapshot sebelumnya — chunk kumulatif berikutnya MENGGANTI
|
|
497
|
+
// (overwrite) kontribusi, bukan menjumlah. Nilai turn/session langsung
|
|
498
|
+
// terlihat oleh watcher budget (delta diterapkan seketika).
|
|
499
|
+
//
|
|
500
|
+
// Deteksi batas permintaan dalam step yang sama (recovery/retry kernel):
|
|
501
|
+
// total kumulatif streaming hanya bertambah dalam satu permintaan, jadi
|
|
502
|
+
// nilai yang menurun menandakan permintaan baru → komit snapshot lama dulu.
|
|
503
|
+
if (pendingRequestTokens && reportedTotal < lastRequestTotal) {
|
|
504
|
+
flushPendingRequest()
|
|
505
|
+
requestBoundary += 1
|
|
241
506
|
}
|
|
242
|
-
|
|
507
|
+
lastRequestTotal = reportedTotal
|
|
243
508
|
const segModel = effectiveModel ?? model
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
509
|
+
const segCost = segModel
|
|
510
|
+
? costFor(segModel, input, output, cRead, cWrite, segCacheIncluded)
|
|
511
|
+
: undefined
|
|
512
|
+
const newSnapshot = {
|
|
513
|
+
inputTokens: input,
|
|
514
|
+
outputTokens: output,
|
|
515
|
+
totalTokens: reportedTotal,
|
|
516
|
+
cacheReadTokens: cRead,
|
|
517
|
+
cacheWriteTokens: cWrite,
|
|
518
|
+
cost: segCost,
|
|
519
|
+
segModel,
|
|
252
520
|
}
|
|
521
|
+
applyPending(newSnapshot, pendingRequestTokens)
|
|
522
|
+
pendingRequestTokens = newSnapshot
|
|
253
523
|
}
|
|
254
524
|
})
|
|
255
525
|
|
|
@@ -280,8 +550,24 @@ export function createUsageCollector(bus: EventBus, model?: string) {
|
|
|
280
550
|
* header REPL, dan pemeriksaan `--budget`. Tidak terpengaruh reset().
|
|
281
551
|
*/
|
|
282
552
|
getSession: (m?: string) => withCost(session, m ?? effectiveModel ?? sessionModel ?? model),
|
|
553
|
+
/** [Fase 3 / LOOP-INV-11] Jumlah turn sesi (termasuk carry-forward resume). */
|
|
554
|
+
getTurnCount: () => sessionTurns,
|
|
555
|
+
/** [Fase 3 / CTX-03] Laporan token terakhir dari provider untuk kalibrasi. */
|
|
556
|
+
lastProviderTokens: () => lastProviderUsage,
|
|
283
557
|
modelUsed: () => ({ effective: effectiveModel, provider: effectiveProvider }),
|
|
284
558
|
reset: () => {
|
|
559
|
+
// [Fase 7 / Live #2] reset() = batas turn. `pendingRequestTokens` masih
|
|
560
|
+
// menunjuk ke snapshot permintaan turn SEBELUMNYA bila turn berakhir
|
|
561
|
+
// tanpa event `step:started`/`turn:started` (mis. driver REPL langsung
|
|
562
|
+
// memanggil reset() setelah persistCurrent). Tanpa flush di sini, usage
|
|
563
|
+
// event pertama turn baru dihitung sebagai DELTA terhadap snapshot lama
|
|
564
|
+
// (total sama → selisih nol), sehingga sesi gagal mengakumulasi lintas
|
|
565
|
+
// turn (regresi: session.totalTokens berhenti di 1100, bukan 3300).
|
|
566
|
+
// Reset juga `lastRequestTotal` agar heuristik "total menurun =
|
|
567
|
+
// permintaan baru" tidak keliru menilai chunk pertama turn baru sebagai
|
|
568
|
+
// lanjutan permintaan lama ketika kebetulan totalnya sama/lebih besar.
|
|
569
|
+
flushPendingRequest()
|
|
570
|
+
lastRequestTotal = 0
|
|
285
571
|
turn = emptyUsage()
|
|
286
572
|
turnCost = 0
|
|
287
573
|
turnHasCost = false
|
package/src/policy/verifier.ts
CHANGED
|
@@ -11,6 +11,8 @@ export interface VerifyResult {
|
|
|
11
11
|
ok: boolean
|
|
12
12
|
output: string
|
|
13
13
|
command: string
|
|
14
|
+
/** [Fase 3 / LOOP-INV-12] Kode keluar proses verifier (0 = lulus). Opsional demi back-compat. */
|
|
15
|
+
exitCode?: number
|
|
14
16
|
}
|
|
15
17
|
|
|
16
18
|
/**
|
|
@@ -43,15 +45,16 @@ export async function runVerify(
|
|
|
43
45
|
...(signal ? { signal } : {}),
|
|
44
46
|
})
|
|
45
47
|
const output = `${stdout}${stderr ? `\n${stderr}` : ""}`.trim()
|
|
46
|
-
return { ok: true, output, command }
|
|
48
|
+
return { ok: true, output, command, exitCode: 0 }
|
|
47
49
|
} catch (e) {
|
|
48
50
|
// Exec yang mati karena abort (atau abort datang saat exec jalan) bukan
|
|
49
51
|
// kegagalan verifikasi — lempar agar self-heal/REPL berhenti, bukan
|
|
50
52
|
// memperbaiki.
|
|
51
53
|
if (signal?.aborted) signal.throwIfAborted()
|
|
52
|
-
const err = e as { stdout?: string; stderr?: string; message?: string }
|
|
54
|
+
const err = e as { stdout?: string; stderr?: string; message?: string; code?: unknown }
|
|
53
55
|
const output = `${err.stdout ?? ""}${err.stderr ? `\n${err.stderr}` : ""}`.trim() || String(e)
|
|
54
|
-
|
|
56
|
+
const exitCode = typeof err.code === "number" && Number.isFinite(err.code) ? err.code : 1
|
|
57
|
+
return { ok: false, output: output.slice(0, 8000), command, exitCode }
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
60
|
// Deteksi perintah verify yang masuk akal untuk proyek di `cwd`.
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
// WorkMode (S2.1) — lapis intent tipis di ATAS PermissionMode, bukan pengganti.
|
|
2
|
+
//
|
|
3
|
+
// Kenapa bukan sekadar projection mode: `PLAN × auto/ask` TIDAK boleh berubah
|
|
4
|
+
// menjadi `plan` polos, karena handler `plan` melewatkan gerbang approval
|
|
5
|
+
// `delegate_task` yang dimiliki `auto`/`ask` (owner decision S2.1). Jadi lapis
|
|
6
|
+
// ini memasang CEILING lebih dulu, lalu menyerahkan keputusan DI DALAM ceiling
|
|
7
|
+
// ke handler PermissionMode asli — allow/deny/prompt-nya utuh.
|
|
8
|
+
//
|
|
9
|
+
// Ceiling memakai handler `readonly`/`plan` yang sudah ada sebagai primitif:
|
|
10
|
+
// satu-satunya sumber daftar tool (18 nama read-only + 3 ekstra plan), tanpa
|
|
11
|
+
// menduplikasi READONLY_TOOLS atau membangun engine kedua.
|
|
12
|
+
|
|
13
|
+
import type { PermissionHandler, ToolCall } from "#minicore"
|
|
14
|
+
import { createPermissionHandler, type PermissionMode } from "./permission.ts"
|
|
15
|
+
|
|
16
|
+
export type WorkMode = "DISCUSS" | "PLAN" | "EXECUTE"
|
|
17
|
+
|
|
18
|
+
/** WorkMode yang memasang ceiling. EXECUTE = identitas (base dipakai apa adanya). */
|
|
19
|
+
export type RestrictiveWorkMode = Exclude<WorkMode, "EXECUTE">
|
|
20
|
+
|
|
21
|
+
type ModeControl = {
|
|
22
|
+
__setMode(m: PermissionMode): void
|
|
23
|
+
__getMode(): PermissionMode
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export type WorkModePermissionHandler = PermissionHandler &
|
|
27
|
+
ModeControl & {
|
|
28
|
+
// P12 S2.2 Slice 5 — kontrol WorkMode runtime (setWorkMode/getWorkMode).
|
|
29
|
+
// Mirip __setMode/__getMode milik PM: kernel mengkonsultasi handler per
|
|
30
|
+
// tool call, jadi __setWorkMode menggeser ceiling tanpa meng-ganti handler.
|
|
31
|
+
__setWorkMode(m: WorkMode): void
|
|
32
|
+
__getWorkMode(): WorkMode
|
|
33
|
+
// Sinkronis dengan kontrak PermissionHandler vendor (dapat sinkron ATAU
|
|
34
|
+
// Promise): deskripsi deny diharapkan sinkron oleh semua handler produksi,
|
|
35
|
+
// tetapi executor kernel meng-await hasilnya — mengetik hanya string akan
|
|
36
|
+
// memicu TS2322 dan mengabaikan kemungkinan handler asinkron.
|
|
37
|
+
describeDenial(call: ToolCall): Promise<string | undefined> | string | undefined
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
function requireModeControl(base: PermissionHandler): ModeControl {
|
|
41
|
+
const ctrl = base as Partial<ModeControl>
|
|
42
|
+
if (typeof ctrl.__getMode !== "function" || typeof ctrl.__setMode !== "function") {
|
|
43
|
+
// Fail-closed: tanpa kontrol mode, ceiling PLAN tak bisa mengikuti mode PM
|
|
44
|
+
// saat runtime — lebih baik menolak konstruksi daripada memakai snapshot
|
|
45
|
+
// basi yang bisa mencabut ceiling setelah `__setMode`.
|
|
46
|
+
throw new Error(
|
|
47
|
+
"createWorkModePermissionHandler: base handler wajib mengekspos __getMode/__setMode (fail-closed)",
|
|
48
|
+
)
|
|
49
|
+
}
|
|
50
|
+
return ctrl as ModeControl
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// Seleksi ceiling per mode PM SAAT INI (bukan snapshot konstruksi):
|
|
54
|
+
// DISCUSS selalu read-only; PLAN memakai ceiling read-only saat PM sudah lebih
|
|
55
|
+
// ketat (`allowlist`/`readonly`), selain itu ceiling plan.
|
|
56
|
+
function ceilingFor(workMode: RestrictiveWorkMode, baseMode: PermissionMode): "readonly" | "plan" {
|
|
57
|
+
if (workMode === "DISCUSS") return "readonly"
|
|
58
|
+
return baseMode === "allowlist" || baseMode === "readonly" ? "readonly" : "plan"
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
export function createWorkModePermissionHandler(opts: {
|
|
62
|
+
workMode: WorkMode
|
|
63
|
+
base: PermissionHandler
|
|
64
|
+
root?: string
|
|
65
|
+
}): WorkModePermissionHandler {
|
|
66
|
+
const ctrl = requireModeControl(opts.base)
|
|
67
|
+
// P12 S2.2 Slice 5 — WorkMode MUTABLE (bukan snapshot konstruksi). Kernel
|
|
68
|
+
// mengkonsultasi handler per tool call, jadi __setWorkMode runtime menggeser
|
|
69
|
+
// ceiling tanpa mengganti handler. EXECUTE = delegasi base (perilaku identik).
|
|
70
|
+
let wm: WorkMode = opts.workMode
|
|
71
|
+
const ceilings = {
|
|
72
|
+
readonly: createPermissionHandler({
|
|
73
|
+
mode: "readonly",
|
|
74
|
+
root: opts.root,
|
|
75
|
+
}) as unknown as PermissionHandler,
|
|
76
|
+
plan: createPermissionHandler({
|
|
77
|
+
mode: "plan",
|
|
78
|
+
root: opts.root,
|
|
79
|
+
}) as unknown as PermissionHandler,
|
|
80
|
+
}
|
|
81
|
+
|
|
82
|
+
// Pemilik keputusan deny per-call, supaya `describeDenial` membaca seam
|
|
83
|
+
// handler yang benar (ceiling vs base) dengan semantik hapus-saat-baca.
|
|
84
|
+
const ownerById = new Map<string, PermissionHandler>()
|
|
85
|
+
const ownerByRef = new WeakMap<object, PermissionHandler>()
|
|
86
|
+
|
|
87
|
+
function rememberDeny(call: ToolCall, owner: PermissionHandler): void {
|
|
88
|
+
try {
|
|
89
|
+
const id = (call as { id?: unknown } | null)?.id
|
|
90
|
+
if (typeof id === "string" && id) {
|
|
91
|
+
if (ownerById.size > 500) ownerById.delete(ownerById.keys().next().value as string)
|
|
92
|
+
ownerById.set(id, owner)
|
|
93
|
+
return
|
|
94
|
+
}
|
|
95
|
+
if (call && typeof call === "object") ownerByRef.set(call as object, owner)
|
|
96
|
+
} catch {}
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
function takeDenyOwner(call: ToolCall): PermissionHandler | undefined {
|
|
100
|
+
try {
|
|
101
|
+
const id = (call as { id?: unknown } | null)?.id
|
|
102
|
+
if (typeof id === "string" && id) {
|
|
103
|
+
const owner = ownerById.get(id)
|
|
104
|
+
ownerById.delete(id)
|
|
105
|
+
return owner
|
|
106
|
+
}
|
|
107
|
+
if (call && typeof call === "object") {
|
|
108
|
+
const key = call as object
|
|
109
|
+
const owner = ownerByRef.get(key)
|
|
110
|
+
ownerByRef.delete(key)
|
|
111
|
+
return owner
|
|
112
|
+
}
|
|
113
|
+
} catch {}
|
|
114
|
+
return undefined
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
const handler = {
|
|
118
|
+
async check(call: ToolCall, _deps?: unknown): Promise<"allow" | "deny"> {
|
|
119
|
+
// EXECUTE = identitas: delegasi penuh ke base tanpa ceiling (perilaku
|
|
120
|
+
// lama). Memungkinkan upgrade runtime EXECUTE→DISCUSS/PLAN walau komposisi
|
|
121
|
+
// awal EXECUTE (compose mengembalikan base) TIDAK menyediakan __setWorkMode —
|
|
122
|
+
// jalur ini dipakai createMinicodeSession yang SELALU membungkus.
|
|
123
|
+
if (wm === "EXECUTE") return opts.base.check(call, _deps as never)
|
|
124
|
+
// Baca mode PM sekarang: `__setMode` runtime menggeser seleksi ceiling
|
|
125
|
+
// (PLAN × allowlist/readonly = read-only), bukan membekukan yang lama.
|
|
126
|
+
// Baca WorkMode sekarang (`wm` mutable) — __setWorkMode runtime menggeser
|
|
127
|
+
// ceiling DISCUSS↔PLAN.
|
|
128
|
+
const ceiling = ceilings[ceilingFor(wm, ctrl.__getMode())]
|
|
129
|
+
// Ceiling DULU: operasi di luar ceiling tak boleh memicu prompt base
|
|
130
|
+
// (requirement S2.1 #1) — ceiling readonly/plan tak pernah prompt.
|
|
131
|
+
const ceilingDecision = await ceiling.check(call, _deps as never)
|
|
132
|
+
if (ceilingDecision !== "allow") {
|
|
133
|
+
rememberDeny(call, ceiling)
|
|
134
|
+
return "deny"
|
|
135
|
+
}
|
|
136
|
+
// Di dalam ceiling: keputusan mutlak handler PM asli (termasuk prompt
|
|
137
|
+
// gated `delegate_task` untuk PLAN × auto/ask — owner decision S2.1).
|
|
138
|
+
const decision = await opts.base.check(call, _deps as never)
|
|
139
|
+
if (decision !== "allow") rememberDeny(call, opts.base)
|
|
140
|
+
return decision
|
|
141
|
+
},
|
|
142
|
+
__setMode(m: PermissionMode): void {
|
|
143
|
+
ctrl.__setMode(m)
|
|
144
|
+
},
|
|
145
|
+
__getMode(): PermissionMode {
|
|
146
|
+
// Metadata yang dilaporkan tetap mode PM asli; WorkMode tidak bocor.
|
|
147
|
+
return ctrl.__getMode()
|
|
148
|
+
},
|
|
149
|
+
__setWorkMode(m: WorkMode): void {
|
|
150
|
+
wm = m
|
|
151
|
+
},
|
|
152
|
+
__getWorkMode(): WorkMode {
|
|
153
|
+
return wm
|
|
154
|
+
},
|
|
155
|
+
describeDenial(call: ToolCall): Promise<string | undefined> | string | undefined {
|
|
156
|
+
// EXECUTE: base mengambil keputusan langsung (check delegasi), jadi alasan
|
|
157
|
+
// deny ada di base.describeDenial sendiri — bukan di owner map wrapper.
|
|
158
|
+
if (wm === "EXECUTE") {
|
|
159
|
+
const baseSeam = opts.base.describeDenial
|
|
160
|
+
return typeof baseSeam === "function" ? baseSeam.call(opts.base, call) : undefined
|
|
161
|
+
}
|
|
162
|
+
const owner = takeDenyOwner(call)
|
|
163
|
+
const seam = owner?.describeDenial
|
|
164
|
+
return typeof seam === "function" ? seam.call(owner, call) : undefined
|
|
165
|
+
},
|
|
166
|
+
}
|
|
167
|
+
return handler as WorkModePermissionHandler
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
/** Titik komposisi produksi: EXECUTE = base identitas, sisanya dibungkus ceiling. */
|
|
171
|
+
export function composeWorkModePermissionHandler(opts: {
|
|
172
|
+
workMode: WorkMode
|
|
173
|
+
base: PermissionHandler
|
|
174
|
+
root?: string
|
|
175
|
+
}): PermissionHandler {
|
|
176
|
+
if (opts.workMode === "EXECUTE") return opts.base
|
|
177
|
+
return createWorkModePermissionHandler({
|
|
178
|
+
workMode: opts.workMode,
|
|
179
|
+
base: opts.base,
|
|
180
|
+
root: opts.root,
|
|
181
|
+
})
|
|
182
|
+
}
|