minicode-ai 0.13.1 → 0.14.1
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 +35 -0
- package/LICENSE +21 -21
- package/README.md +4 -0
- package/cli/args.ts +66 -5
- package/cli/commands/acp.ts +18 -3
- package/cli/commands/daemon.ts +114 -19
- package/cli/commands/exec.ts +104 -7
- package/cli/commands/mcp.ts +66 -5
- package/cli/commands/memory.ts +46 -14
- package/cli/commands.ts +5 -0
- package/cli/index.ts +51 -16
- package/cli/setup.ts +380 -32
- package/cli/tui.ts +115 -50
- package/docs/TERMINAL_CONTRACT.md +91 -24
- package/docs/agents.md +3 -3
- package/docs/choosing-mode.md +20 -13
- package/docs/cli.md +12 -11
- package/docs/environment.md +4 -3
- package/docs/memory-sessions.md +5 -0
- package/package.json +2 -1
- package/src/app/session.ts +159 -35
- package/src/app/tool-layer.ts +69 -62
- package/src/daemon/approvals.ts +25 -1
- package/src/daemon/client.ts +51 -1
- package/src/daemon/control.ts +8 -0
- package/src/daemon/protocol.ts +47 -1
- package/src/daemon/server.ts +45 -9
- package/src/daemon/subscription.ts +25 -1
- package/src/daemon/telemetry.ts +4 -0
- package/src/hooks/run.ts +5 -1
- package/src/mcp/client.ts +349 -90
- package/src/mcp/http-transport.ts +7 -0
- package/src/mcp/transport.ts +5 -0
- package/src/memory/files.ts +69 -3
- package/src/memory/vector.ts +556 -160
- package/src/policy/approval-binding.ts +199 -0
- package/src/policy/context.ts +20 -1
- package/src/policy/executor.ts +44 -5
- package/src/policy/permission.ts +317 -41
- package/src/policy/tool-contract.ts +94 -0
- package/src/policy/usage.ts +3 -1
- package/src/policy/work-mode.ts +99 -17
- package/src/presentation/adapter.ts +157 -7
- package/src/presentation/events.ts +173 -1
- package/src/presentation/model.ts +37 -0
- package/src/presentation/projection.ts +107 -18
- package/src/presentation/reducer.ts +134 -10
- package/src/sandbox/os.ts +18 -1
- package/src/session/persistence.ts +153 -11
- package/src/task/store.ts +43 -3
- package/src/tools/memory.ts +70 -10
- package/src/tools/task.ts +7 -1
- package/src/tools/todo.ts +14 -4
- package/src/ui/approval/prompt.ts +52 -7
- package/src/ui/assistant/simple.ts +160 -57
- package/src/ui/contract.ts +46 -0
- package/src/ui/footer.ts +31 -17
- package/src/ui/i18n/en.ts +12 -3
- package/src/ui/i18n/id.ts +12 -3
- package/src/ui/render/collapse.ts +24 -52
- package/src/ui/render/detail.ts +14 -9
- package/src/ui/render/errors.ts +8 -0
- package/src/ui/render/reasoning.ts +13 -8
- package/src/ui/session-state.ts +243 -0
- package/src/ui/tui/app.ts +13 -7
- package/src/ui/tui/transcript.ts +271 -30
- 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/src/daemon/approvals.ts
CHANGED
|
@@ -14,6 +14,7 @@
|
|
|
14
14
|
|
|
15
15
|
import { randomUUID } from "node:crypto"
|
|
16
16
|
import type { PermissionAsk } from "../policy/permission.ts"
|
|
17
|
+
import { scrubSecrets } from "../policy/scrub.ts"
|
|
17
18
|
import { hashArgs } from "../session/journal.ts"
|
|
18
19
|
import type { ApprovalView, RefusalBody } from "./protocol.ts"
|
|
19
20
|
import { sanitizeLabel } from "./sanitize.ts"
|
|
@@ -338,7 +339,11 @@ export class ApprovalBroker {
|
|
|
338
339
|
sid,
|
|
339
340
|
runId: opts.runId ? opts.runId() : null,
|
|
340
341
|
tool,
|
|
341
|
-
|
|
342
|
+
// [Area B · PROMPT 06] Bukti yang sama dengan prompt TUI: preview
|
|
343
|
+
// per-tool yang SUDAH di-scrub secret oleh policy + tier risiko.
|
|
344
|
+
// Sebelumnya daemon melihat JSON args mentah (hanya sanitizeLabel) —
|
|
345
|
+
// konsumen daemon bisa melihat secret yang tak pernah tampil di TUI.
|
|
346
|
+
summary: approvalSummary(call?.riskTier, call?.diffPreview, call?.args),
|
|
342
347
|
// [Fase 2 / LOOP-INV-08] Ikat keputusan ke argumen kanonis + id call.
|
|
343
348
|
argsHash: hashArgs(call?.args ?? {}),
|
|
344
349
|
invocationId: typeof call?.id === "string" && call.id !== "" ? call.id : null,
|
|
@@ -348,6 +353,25 @@ export class ApprovalBroker {
|
|
|
348
353
|
}
|
|
349
354
|
}
|
|
350
355
|
|
|
356
|
+
/**
|
|
357
|
+
* Ringkasan approval untuk konsumen daemon.
|
|
358
|
+
*
|
|
359
|
+
* Urutan prioritas: preview per-tool dari policy (sudah di-scrub) → fallback
|
|
360
|
+
* JSON args yang juga di-scrub. Tier risiko didahulukan sebagai tag agar
|
|
361
|
+
* konsumen tanpa renderer diff tetap tahu efeknya. Tak ada jalur yang
|
|
362
|
+
* mengirim args mentah ke luar proses.
|
|
363
|
+
*/
|
|
364
|
+
function approvalSummary(
|
|
365
|
+
riskTier: string | undefined,
|
|
366
|
+
diffPreview: string | undefined,
|
|
367
|
+
args: unknown,
|
|
368
|
+
): string {
|
|
369
|
+
const body = diffPreview?.trim() || scrubSecrets(summarizeArgs(args)).trim()
|
|
370
|
+
const tier = riskTier?.trim() ? riskTier.trim() : ""
|
|
371
|
+
if (!tier) return body
|
|
372
|
+
return body ? `[${tier}] ${body}` : `[${tier}]`
|
|
373
|
+
}
|
|
374
|
+
|
|
351
375
|
/** Ringkasan args untuk ditampilkan konsumen — dipangkas, dibasuh, dibatasi. */
|
|
352
376
|
function summarizeArgs(args: unknown): string {
|
|
353
377
|
if (args === undefined || args === null) return ""
|
package/src/daemon/client.ts
CHANGED
|
@@ -9,7 +9,12 @@
|
|
|
9
9
|
import { connect, type Socket } from "node:net"
|
|
10
10
|
import { type DiscoveryResult, discover, readEndpoint } from "./discovery.ts"
|
|
11
11
|
import { encodeFrame, FrameDecoder } from "./framing.ts"
|
|
12
|
-
import {
|
|
12
|
+
import {
|
|
13
|
+
DAEMON_PROTOCOL,
|
|
14
|
+
type DaemonStreamPhase,
|
|
15
|
+
type ServerMessage,
|
|
16
|
+
type SubscribeFrom,
|
|
17
|
+
} from "./protocol.ts"
|
|
13
18
|
|
|
14
19
|
export interface ConnectTarget {
|
|
15
20
|
host: string
|
|
@@ -96,6 +101,14 @@ export class DaemonClient {
|
|
|
96
101
|
#closed = false
|
|
97
102
|
welcome: Extract<ServerMessage, { t: "welcome" }> | null = null
|
|
98
103
|
#pendingControl = new Map<string, (msg: ServerMessage) => void>()
|
|
104
|
+
/**
|
|
105
|
+
* [Area C · PROMPT 06] Fase stream per-sesi, dilacak dari wire.
|
|
106
|
+
*
|
|
107
|
+
* Sumber: `subscribed.phase` (fase awal) lalu `tail_marker.phase` (fase
|
|
108
|
+
* live). Tanpa pelacakan ini, konsumen tak bisa menampilkan badge
|
|
109
|
+
* replay→live tanpa harus menebak dari urutan pesan.
|
|
110
|
+
*/
|
|
111
|
+
readonly #phases = new Map<string, DaemonStreamPhase>()
|
|
99
112
|
|
|
100
113
|
private constructor(sock: Socket) {
|
|
101
114
|
this.#sock = sock
|
|
@@ -113,6 +126,9 @@ export class DaemonClient {
|
|
|
113
126
|
for (const raw of msgs) {
|
|
114
127
|
if (!raw || typeof raw !== "object" || !("t" in raw)) continue
|
|
115
128
|
const msg = raw as ServerMessage
|
|
129
|
+
// [Area C] Latch fase stream per-sesi (sumber: wire, bukan tebakan).
|
|
130
|
+
if (msg.t === "subscribed") this.#phases.set(msg.sid, msg.phase)
|
|
131
|
+
else if (msg.t === "tail_marker") this.#phases.set(msg.sid, msg.phase)
|
|
116
132
|
if (msg.t === "control_result") {
|
|
117
133
|
const waiter = this.#pendingControl.get(msg.idem)
|
|
118
134
|
if (waiter) {
|
|
@@ -207,6 +223,36 @@ export class DaemonClient {
|
|
|
207
223
|
this.#send({ t: "subscribe", sid, from, consumer: this.welcome?.consumer ?? "" })
|
|
208
224
|
}
|
|
209
225
|
|
|
226
|
+
/**
|
|
227
|
+
* [Area C · PROMPT 06] Fase stream terakhir yang diketahui untuk satu sesi
|
|
228
|
+
* (`replay` sebelum `tail_marker`, `live` sesudahnya). `undefined` = belum
|
|
229
|
+
* subscribe / belum ada fase yang dilaporkan.
|
|
230
|
+
*/
|
|
231
|
+
phaseOf(sid: string): DaemonStreamPhase | undefined {
|
|
232
|
+
return this.#phases.get(sid)
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
/**
|
|
236
|
+
* Mapping EKPLISIT dari kosakata wire daemon ke kosakata provenance
|
|
237
|
+
* TAMPILAN (`live`/`replay`, lowercase — `src/presentation/projection.ts`).
|
|
238
|
+
*
|
|
239
|
+
* Dua kosakata itu sengaja terpisah (lihat catatan di `protocol.ts`):
|
|
240
|
+
* provenance wire = "dari mana event dibaca"; provenance tampilan = "status
|
|
241
|
+
* rebuild terhadap watershed". Yang dipetakan di sini adalah FASE stream,
|
|
242
|
+
* yang happens punya nilai yang sama — tapi mappingnya tetap ditulis
|
|
243
|
+
* eksplisit supaya tak ada perbandingan diam-diam antar kosakata.
|
|
244
|
+
*
|
|
245
|
+
* Badge yang dirender memakai penanda provenans yang SUDAH ada di lapisan
|
|
246
|
+
* presentasi (`provenanceMark`): fase "replay" → " [replay]", fase "live" →
|
|
247
|
+
* tanpa badge (live tak pernah diberi badge).
|
|
248
|
+
*/
|
|
249
|
+
streamProvenance(sid: string): "live" | "replay" | undefined {
|
|
250
|
+
const phase = this.#phases.get(sid)
|
|
251
|
+
if (phase === "replay") return "replay"
|
|
252
|
+
if (phase === "live") return "live"
|
|
253
|
+
return undefined
|
|
254
|
+
}
|
|
255
|
+
|
|
210
256
|
ack(sid: string, seq: number): void {
|
|
211
257
|
this.#send({ t: "ack", sid, seq, consumer: this.welcome?.consumer ?? "" })
|
|
212
258
|
}
|
|
@@ -247,6 +293,10 @@ export class DaemonClient {
|
|
|
247
293
|
if (this.#closed) return
|
|
248
294
|
this.#send({ t: "goodbye" })
|
|
249
295
|
this.#closed = true
|
|
296
|
+
// [Area C] Fase stream tak boleh bertahan hidup setelah socket tutup —
|
|
297
|
+
// consumer yang masih memegang klien tak boleh menampilkan "replay"
|
|
298
|
+
// untuk stream yang sudah mati.
|
|
299
|
+
this.#phases.clear()
|
|
250
300
|
try {
|
|
251
301
|
this.#sock.end()
|
|
252
302
|
} catch {
|
package/src/daemon/control.ts
CHANGED
|
@@ -21,6 +21,14 @@ export interface HostedSessionInfo {
|
|
|
21
21
|
runId: string | null
|
|
22
22
|
runStatus: string | null
|
|
23
23
|
presentationHead: number
|
|
24
|
+
/** P0.2 (Q5): WorkMode efektif sesi yang di-host (bila diketahui host). */
|
|
25
|
+
workMode?: "DISCUSS" | "PLAN" | "EXECUTE"
|
|
26
|
+
/**
|
|
27
|
+
* P2.3: hasil recovery run terakhir yang durable (mis. UNKNOWN setelah
|
|
28
|
+
* restart). Operator dapat membedakan LIVE vs reconstructed/interrupted
|
|
29
|
+
* tanpa membaca log. Absen = belum ada run.
|
|
30
|
+
*/
|
|
31
|
+
recoveryStatus?: string | null
|
|
24
32
|
}
|
|
25
33
|
|
|
26
34
|
/**
|
package/src/daemon/protocol.ts
CHANGED
|
@@ -104,6 +104,25 @@ export type ServerMessage =
|
|
|
104
104
|
* yang tak pernah bisa ia deteksi sendiri.
|
|
105
105
|
*/
|
|
106
106
|
snapshotRejected: number
|
|
107
|
+
/**
|
|
108
|
+
* [Area C · PROMPT 06] Fase stream SAAT INI di langganan ini.
|
|
109
|
+
*
|
|
110
|
+
* "replay" = server masih akan mengirim event durable lama (event
|
|
111
|
+
* setelah pesan ini masih bisa Ber-provenance "REPLAY"); "live" = tak
|
|
112
|
+
* ada replay yang menunggu, stream ini live sejak awal.
|
|
113
|
+
*
|
|
114
|
+
* Kenapa Wajib di sini: tanpa field ini konsumen harus MENEBAK apakah
|
|
115
|
+
* replay akan datang (dari `fromSeq` vs head yang tak dikirim), dan
|
|
116
|
+
* tebakan yang salah membuat UI menampilkan "live" untuk data yang
|
|
117
|
+
* sebenarnya basi — atau sebaliknya, menampilkan "replay" untuk stream
|
|
118
|
+
* yang sudah live. `tail_marker` tetap menjadi penanda TRANSISI
|
|
119
|
+
* (phase "live"), jadi kedua titik itu konsisten.
|
|
120
|
+
*
|
|
121
|
+
* Field TAMBAHAN (additive): konsumen lama yang mengabaikan field
|
|
122
|
+
* tak dikenal tetap bekerja; ia hanya tak bisa menampilkan badge fase
|
|
123
|
+
* awal sampai `tail_marker` tiba.
|
|
124
|
+
*/
|
|
125
|
+
phase: DaemonStreamPhase
|
|
107
126
|
}
|
|
108
127
|
| { t: "frontiers"; sid: string; frontiers: SessionFrontiers }
|
|
109
128
|
| { t: "snapshot"; sid: string; consumer: string; snapshot: SessionSnapshot }
|
|
@@ -116,7 +135,19 @@ export type ServerMessage =
|
|
|
116
135
|
event: unknown
|
|
117
136
|
}
|
|
118
137
|
| { t: "replay_done"; sid: string; consumer: string; upToSeq: number }
|
|
119
|
-
| {
|
|
138
|
+
| {
|
|
139
|
+
t: "tail_marker"
|
|
140
|
+
sid: string
|
|
141
|
+
consumer: string
|
|
142
|
+
atSeq: number
|
|
143
|
+
/**
|
|
144
|
+
* F-DAEMON-1: fase stream pada titik ini — selalu "live" (tail_marker
|
|
145
|
+
* ADALAH transisi REPLAY→LIVE). Bila tidak ada replay (subscribe "tail"
|
|
146
|
+
* dari head), fase tetap "live" dan event yang ditandai LIVE sudah tiba
|
|
147
|
+
* sejak awal; konsumen tak perlu menebak dari urutan pesan.
|
|
148
|
+
*/
|
|
149
|
+
phase: DaemonStreamPhase
|
|
150
|
+
}
|
|
120
151
|
| { t: "ack_ok"; sid: string; consumer: string; seq: number }
|
|
121
152
|
| { t: "approval"; consumer: string; approval: ApprovalView }
|
|
122
153
|
| { t: "control_result"; idem: string; ok: boolean; result?: unknown; refusal?: RefusalBody }
|
|
@@ -135,9 +166,24 @@ export interface RefusalBody {
|
|
|
135
166
|
* Provenance sebuah event di mata konsumen. LIVE = dari penulis sesi sekarang;
|
|
136
167
|
* REPLAY = dibaca dari durable store; RECONSTRUCTED = hasil rebuild presentasi;
|
|
137
168
|
* UNKNOWN = tak dapat dipastikan. Tak boleh pernah diratakan ke satu nilai.
|
|
169
|
+
*
|
|
170
|
+
* INI KOSAKATA WIRE (UPPERCASE). Beda dari kosakata provenance TAMPILAN
|
|
171
|
+
* (lowercase `live|replay|reconstructed|unknown` di `src/presentation/projection.ts`
|
|
172
|
+
* / `src/ui/contract.ts:UiProvenance`). Dua kosakata itu disengaja terpisah:
|
|
173
|
+
* yang satu menjelaskan (di mata konsumen daemon) DARI MANA sebuah event dibaca
|
|
174
|
+
* dari toko; yang lain menjelaskan (di mata renderer) status rebuild/`incomplete`
|
|
175
|
+
* baris transcript terhadap watershed rebuild. Jangan pernah membandingkan
|
|
176
|
+
* keduanya secara langsung tanpa mapping eksplisit.
|
|
138
177
|
*/
|
|
139
178
|
export type Provenance = "LIVE" | "REPLAY" | "RECONSTRUCTED" | "UNKNOWN"
|
|
140
179
|
|
|
180
|
+
/**
|
|
181
|
+
* F-DAEMON-1: fase stream per-konsumen. `replay` = masih melayani event durable
|
|
182
|
+
* yang sudah ada (SEBELUM `tail_marker`); `live` = sudah melewati `tail_marker`,
|
|
183
|
+
* setiap event berikutnya adalah LIVE (mungkin belum durable).
|
|
184
|
+
*/
|
|
185
|
+
export type DaemonStreamPhase = "replay" | "live"
|
|
186
|
+
|
|
141
187
|
/** Frontier = batas pengetahuan terakhir per toko (bukan kepemilikan). */
|
|
142
188
|
export interface SessionFrontiers {
|
|
143
189
|
writerEpoch: number
|
package/src/daemon/server.ts
CHANGED
|
@@ -96,6 +96,8 @@ interface Conn {
|
|
|
96
96
|
subs: Map<string, Subscription>
|
|
97
97
|
paused: boolean
|
|
98
98
|
closed: boolean
|
|
99
|
+
/** P2.3: replay yang berhenti karena socket backpressure; dilanjutkan saat drain. */
|
|
100
|
+
pendingReplay?: { sid: string; consumer: string; fromSeq: number; head: number }
|
|
99
101
|
}
|
|
100
102
|
|
|
101
103
|
let connSeq = 0
|
|
@@ -178,6 +180,13 @@ export class DaemonServer {
|
|
|
178
180
|
})
|
|
179
181
|
socket.on("drain", () => {
|
|
180
182
|
conn.paused = false
|
|
183
|
+
const pending = conn.pendingReplay
|
|
184
|
+
if (pending) {
|
|
185
|
+
conn.pendingReplay = undefined
|
|
186
|
+
this.#deps.telemetry.inc("replay.resumed")
|
|
187
|
+
if (!this.#replayRange(conn, pending.sid, pending.consumer, pending.fromSeq, pending.head))
|
|
188
|
+
return
|
|
189
|
+
}
|
|
181
190
|
this.#pump(conn)
|
|
182
191
|
})
|
|
183
192
|
const teardown = () => this.#teardown(conn)
|
|
@@ -414,9 +423,29 @@ export class DaemonServer {
|
|
|
414
423
|
fromSeq,
|
|
415
424
|
cursor: sub.cursor,
|
|
416
425
|
snapshotRejected: rejected,
|
|
426
|
+
// [Area C · PROMPT 06] Fase Awal stream, dibaca dari latch per-subscription
|
|
427
|
+
// (bukan dihitung ulang di sini): `SubscriptionRegistry.attach` sudah
|
|
428
|
+
// menetapkan "replay" bila fromSeq <= head. Sumber tunggal = latch.
|
|
429
|
+
phase: sub.phase,
|
|
417
430
|
})
|
|
418
431
|
|
|
419
|
-
// 4) replay
|
|
432
|
+
// 4-6) replay → replay_done → tail_marker → pump. Helper mengembalikan
|
|
433
|
+
// false bila socket backpressure memaksa replay berhenti; drain melanjutkan
|
|
434
|
+
// dari cursor yang tersimpan (bukan mengulang dari awal atau membuang sisa).
|
|
435
|
+
if (!this.#replayRange(conn, sid, consumer, fromSeq, head)) return
|
|
436
|
+
this.#pump(conn)
|
|
437
|
+
}
|
|
438
|
+
|
|
439
|
+
/**
|
|
440
|
+
* P2.3: replay yang resumable. `#send` menandai `conn.paused` saat
|
|
441
|
+
* `socket.write()` mengembalikan false; loop berhenti SEBELUM buffer tumbuh
|
|
442
|
+
* tanpa batas, lalu `drain` memanggil helper ini lagi dengan cursor lanjut.
|
|
443
|
+
*/
|
|
444
|
+
#replayRange(conn: Conn, sid: string, consumer: string, fromSeq: number, head: number): boolean {
|
|
445
|
+
const sub = conn.subs.get(sid)
|
|
446
|
+
if (!sub) return true
|
|
447
|
+
const feed = this.#deps.feeds.get(sid)
|
|
448
|
+
if (!feed) return true
|
|
420
449
|
let replayTo = sub.cursor
|
|
421
450
|
if (fromSeq <= head) {
|
|
422
451
|
let cursor = fromSeq - 1
|
|
@@ -426,13 +455,15 @@ export class DaemonServer {
|
|
|
426
455
|
for (const ev of page.events) {
|
|
427
456
|
const seq = numberOr(ev.eventSeq, -1)
|
|
428
457
|
if (seq < fromSeq) continue
|
|
429
|
-
|
|
430
|
-
!this.#send(conn, { t: "event", sid, consumer, seq, provenance: "REPLAY", event: ev })
|
|
431
|
-
)
|
|
432
|
-
return
|
|
458
|
+
this.#send(conn, { t: "event", sid, consumer, seq, provenance: "REPLAY", event: ev })
|
|
433
459
|
cursor = seq
|
|
434
460
|
sub.cursor = seq
|
|
435
461
|
this.#deps.telemetry.inc("events.replayed")
|
|
462
|
+
if (conn.paused) {
|
|
463
|
+
conn.pendingReplay = { sid, consumer, fromSeq: cursor + 1, head }
|
|
464
|
+
this.#deps.telemetry.inc("replay.paused")
|
|
465
|
+
return false
|
|
466
|
+
}
|
|
436
467
|
}
|
|
437
468
|
if (page.events.length < REPLAY_PAGE_LIMIT) break
|
|
438
469
|
}
|
|
@@ -441,10 +472,15 @@ export class DaemonServer {
|
|
|
441
472
|
this.#send(conn, { t: "replay_done", sid, consumer, upToSeq: replayTo })
|
|
442
473
|
// 5) penanda live-tail: segala sesuatu SETELAH pesan ini adalah LIVE dan
|
|
443
474
|
// boleh saja belum durable — konsumen harus memperlakukannya beda.
|
|
444
|
-
|
|
445
|
-
//
|
|
446
|
-
//
|
|
447
|
-
|
|
475
|
+
// F-DAEMON-1: badge transisi REPLAY→LIVE dibawa eksplisit di pesan ini
|
|
476
|
+
// (`phase: "live"`), dan latch per-subscription diputar ke live.
|
|
477
|
+
// [Area C · PROMPT 06] Latch diputar SEBELUM pesan dikirim, dan nilai
|
|
478
|
+
// di wire diambil DARI latch — jadi `Subscription.phase` bukan lagi
|
|
479
|
+
// state mati: ia adalah sumber tunggal fase yang terlihat konsumen.
|
|
480
|
+
sub.markLive()
|
|
481
|
+
this.#send(conn, { t: "tail_marker", sid, consumer, atSeq: replayTo, phase: sub.phase })
|
|
482
|
+
conn.pendingReplay = undefined
|
|
483
|
+
return true
|
|
448
484
|
}
|
|
449
485
|
|
|
450
486
|
#onAck(conn: Conn, raw: Record<string, unknown>): void {
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
// tak bisa dipegang. Batas + overflow eksplisit menjadikannya penolakan yang
|
|
8
8
|
// terlihat (QUEUE_OVERFLOW) alih-alih memori yang meledak.
|
|
9
9
|
|
|
10
|
-
import { MAX_QUEUE_PER_CONN } from "./protocol.ts"
|
|
10
|
+
import { type DaemonStreamPhase, MAX_QUEUE_PER_CONN } from "./protocol.ts"
|
|
11
11
|
import { readConsumerOffset, resetConsumerOffset, writeConsumerOffset } from "./store.ts"
|
|
12
12
|
|
|
13
13
|
export interface PendingEvent {
|
|
@@ -71,6 +71,12 @@ export interface SubscriptionInit {
|
|
|
71
71
|
/** Seq pertama yang AKAN dikirim. Lebih besar dari head = tak ada yang dikirim. */
|
|
72
72
|
fromSeq: number
|
|
73
73
|
maxQueue?: number
|
|
74
|
+
/**
|
|
75
|
+
* F-DAEMON-1: fase awal stream. `replay` bila masih ada event durable yang
|
|
76
|
+
* akan dibaca (fromSeq <= head); `live` bila tak ada replay. Server memanggil
|
|
77
|
+
* `markLive()` saat mengirim `tail_marker`. Absen = "live" (default aman).
|
|
78
|
+
*/
|
|
79
|
+
phase?: DaemonStreamPhase
|
|
74
80
|
/**
|
|
75
81
|
* Workspace pemilik offset. TANPA ini ack jatuh ke `process.cwd()` daemon —
|
|
76
82
|
* padahal offset adalah milik SATU workspace; menulisnya ke tempat lain
|
|
@@ -97,6 +103,13 @@ export class Subscription {
|
|
|
97
103
|
/** true saat antrean pernah penuh — konsumen wajib reconnect + mulai ulang. */
|
|
98
104
|
overflowed = false
|
|
99
105
|
closed = false
|
|
106
|
+
/**
|
|
107
|
+
* F-DAEMON-1: fase stream per-konsumen (bukan global). `replay` sampai
|
|
108
|
+
* `tail_marker` dikirim, lalu `markLive()` memutarnya ke `live`. Memakai
|
|
109
|
+
* field per-`Subscription`, bukan flag global daemon, supaya dua konsumen
|
|
110
|
+
* yang mulai pada titik berbeda tak saling menimpa fase.
|
|
111
|
+
*/
|
|
112
|
+
phase: DaemonStreamPhase
|
|
100
113
|
readonly queue: BoundedQueue<PendingEvent>
|
|
101
114
|
readonly cwd: string | undefined
|
|
102
115
|
|
|
@@ -106,11 +119,20 @@ export class Subscription {
|
|
|
106
119
|
this.sid = init.sid
|
|
107
120
|
this.startSeq = init.fromSeq
|
|
108
121
|
this.cwd = init.cwd
|
|
122
|
+
this.phase = init.phase ?? "live"
|
|
109
123
|
// Cursor awal = satu sebelum seq pertama yang akan dikirim.
|
|
110
124
|
this.cursor = init.fromSeq - 1
|
|
111
125
|
this.queue = new BoundedQueue<PendingEvent>(init.maxQueue ?? MAX_QUEUE_PER_CONN)
|
|
112
126
|
}
|
|
113
127
|
|
|
128
|
+
/**
|
|
129
|
+
* F-DAEMON-1: tandai transisi REPLAY→LIVE. Dipanggil server tepat setelah
|
|
130
|
+
* `tail_marker`; idempoten (memanggil dua kali = tetap live).
|
|
131
|
+
*/
|
|
132
|
+
markLive(): void {
|
|
133
|
+
this.phase = "live"
|
|
134
|
+
}
|
|
135
|
+
|
|
114
136
|
/** Antre event. false = overflow (pemanggil mengirim halte + memutus). */
|
|
115
137
|
enqueue(p: PendingEvent): boolean {
|
|
116
138
|
if (this.closed) return false
|
|
@@ -217,6 +239,8 @@ export class SubscriptionRegistry {
|
|
|
217
239
|
...(init.offsetConsumerId !== undefined ? { offsetConsumerId: init.offsetConsumerId } : {}),
|
|
218
240
|
sid: init.sid,
|
|
219
241
|
fromSeq,
|
|
242
|
+
// F-DAEMON-1: fase awal — replay hanya bila ada event durable untuk dibaca.
|
|
243
|
+
phase: fromSeq <= init.head ? "replay" : "live",
|
|
220
244
|
...(init.maxQueue !== undefined ? { maxQueue: init.maxQueue } : {}),
|
|
221
245
|
...(init.cwd !== undefined ? { cwd: init.cwd } : {}),
|
|
222
246
|
})
|
package/src/daemon/telemetry.ts
CHANGED
|
@@ -14,6 +14,8 @@ export type CounterName =
|
|
|
14
14
|
| "events.delivered"
|
|
15
15
|
| "events.replayed"
|
|
16
16
|
| "events.dropped.overflow"
|
|
17
|
+
| "replay.paused"
|
|
18
|
+
| "replay.resumed"
|
|
17
19
|
| "ack.accepted"
|
|
18
20
|
| "ack.rejected"
|
|
19
21
|
| "control.executed"
|
|
@@ -35,6 +37,8 @@ const COUNTERS: readonly CounterName[] = [
|
|
|
35
37
|
"events.delivered",
|
|
36
38
|
"events.replayed",
|
|
37
39
|
"events.dropped.overflow",
|
|
40
|
+
"replay.paused",
|
|
41
|
+
"replay.resumed",
|
|
38
42
|
"ack.accepted",
|
|
39
43
|
"ack.rejected",
|
|
40
44
|
"control.executed",
|
package/src/hooks/run.ts
CHANGED
|
@@ -28,7 +28,11 @@ export function shouldRunHooks(
|
|
|
28
28
|
permissionMode: string,
|
|
29
29
|
workMode?: "DISCUSS" | "PLAN" | "EXECUTE",
|
|
30
30
|
): boolean {
|
|
31
|
-
|
|
31
|
+
// P0.2 (Q3): hooks berjalan di luar permission system dengan akses penuh
|
|
32
|
+
// Node.js/filesystem/jaringan, sehingga DILARANG di DISCUSS maupun PLAN
|
|
33
|
+
// untuk seluruh PermissionMode. Hanya WorkMode EXECUTE (atau pemanggil
|
|
34
|
+
// legacy tanpa argumen workMode) yang boleh menjalankan hooks.
|
|
35
|
+
if (workMode !== undefined && workMode !== "EXECUTE") return false
|
|
32
36
|
return permissionMode !== "plan" && permissionMode !== "readonly"
|
|
33
37
|
}
|
|
34
38
|
|