@nanhara/hara 0.126.0 → 0.127.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 +37 -0
- package/README.md +4 -1
- package/SECURITY.md +7 -3
- package/dist/agent/loop.js +19 -14
- package/dist/agent/prompt.js +48 -0
- package/dist/index.js +13 -6
- package/dist/mcp/client.js +1 -0
- package/dist/plugins/manifest.js +317 -0
- package/dist/plugins/plugins.js +476 -139
- package/dist/providers/anthropic.js +31 -8
- package/dist/security/private-state.js +1 -1
- package/dist/serve/protocol.js +2 -0
- package/dist/serve/server.js +74 -7
- package/dist/serve/task-events.js +45 -0
- package/package.json +1 -1
|
@@ -56,13 +56,14 @@ const CACHE = { type: "ephemeral" };
|
|
|
56
56
|
* conversation prefix FROM CACHE instead of re-billing + re-processing the whole prompt — the single
|
|
57
57
|
* biggest latency + cost win as history grows (uncached, a long session pays full input every turn).
|
|
58
58
|
*
|
|
59
|
-
* Anthropic caps breakpoints at 4 and orders the cache prefix `tools → system → messages
|
|
60
|
-
*
|
|
61
|
-
*
|
|
62
|
-
*
|
|
59
|
+
* Anthropic caps breakpoints at 4 and orders the cache prefix `tools → system → messages`. Structured Hara
|
|
60
|
+
* prompts spend up to two marks on the static and session boundaries, leaving the changing turn suffix
|
|
61
|
+
* uncached; legacy strings keep one system mark. We then spend up to two rolling marks near the message
|
|
62
|
+
* tail: the last message (so THIS turn's full prefix is written) and one ~2 back (so the NEXT turn — which
|
|
63
|
+
* appends new messages — still finds a long cached prefix to read).
|
|
63
64
|
* Mutates `messages` in place (toAnthropic hands us a fresh array each turn); returns the request-shaped
|
|
64
65
|
* system. Exported pure for tests. */
|
|
65
|
-
export function applyCacheControl(system, messages) {
|
|
66
|
+
export function applyCacheControl(system, messages, systemParts) {
|
|
66
67
|
const mark = (m) => {
|
|
67
68
|
if (typeof m.content === "string") {
|
|
68
69
|
if (m.content.length)
|
|
@@ -80,7 +81,29 @@ export function applyCacheControl(system, messages) {
|
|
|
80
81
|
for (const i of idxs)
|
|
81
82
|
mark(messages[i]);
|
|
82
83
|
// Only cache system when it's substantial enough to matter (an empty text block would 400).
|
|
83
|
-
|
|
84
|
+
let cachedSystem = system;
|
|
85
|
+
const renderedParts = systemParts?.map((part) => part.content).join("\n\n");
|
|
86
|
+
if (system && systemParts?.length && renderedParts === system) {
|
|
87
|
+
const sections = [];
|
|
88
|
+
for (const part of systemParts) {
|
|
89
|
+
const tail = sections.at(-1);
|
|
90
|
+
if (tail?.stability === part.stability)
|
|
91
|
+
tail.text += `\n\n${part.content}`;
|
|
92
|
+
else
|
|
93
|
+
sections.push({ stability: part.stability, text: part.content });
|
|
94
|
+
}
|
|
95
|
+
cachedSystem = sections.map((section, index) => ({
|
|
96
|
+
type: "text",
|
|
97
|
+
// Anthropic concatenates adjacent text blocks directly. Preserve the authoritative rendered string
|
|
98
|
+
// byte-for-byte across our cache boundaries.
|
|
99
|
+
text: section.text + (index < sections.length - 1 ? "\n\n" : ""),
|
|
100
|
+
...(section.stability === "turn" ? {} : { cache_control: CACHE }),
|
|
101
|
+
}));
|
|
102
|
+
}
|
|
103
|
+
else if (system) {
|
|
104
|
+
// Legacy/custom callers still receive the original single cached system block.
|
|
105
|
+
cachedSystem = [{ type: "text", text: system, cache_control: CACHE }];
|
|
106
|
+
}
|
|
84
107
|
return { system: cachedSystem, messages };
|
|
85
108
|
}
|
|
86
109
|
/** Anthropic models whose only valid `thinking` setting is `{type: "adaptive"}` — they reject any
|
|
@@ -116,9 +139,9 @@ export function createAnthropicProvider(opts) {
|
|
|
116
139
|
return {
|
|
117
140
|
id: "anthropic",
|
|
118
141
|
model: opts.model,
|
|
119
|
-
async turn({ system, history, tools, onText, onReasoning, signal }) {
|
|
142
|
+
async turn({ system, systemParts, history, tools, onText, onReasoning, signal }) {
|
|
120
143
|
const thinking = buildThinkingParam(opts.model, opts.reasoningEffort);
|
|
121
|
-
const { system: cachedSystem, messages } = applyCacheControl(system, toAnthropic(history));
|
|
144
|
+
const { system: cachedSystem, messages } = applyCacheControl(system, toAnthropic(history), systemParts);
|
|
122
145
|
const stream = client.messages.stream({
|
|
123
146
|
model: opts.model,
|
|
124
147
|
max_tokens: 32000,
|
|
@@ -8,7 +8,7 @@ import { basename, dirname, join, resolve } from "node:path";
|
|
|
8
8
|
import { FileReadLimitError, MAX_EDIT_READ_BYTES, decodeUtf8Strict, openVerifiedRegularFileNoFollow, verifyOpenedRegularFileSync, } from "../fs-read.js";
|
|
9
9
|
import { optionalPosixOpenFlag } from "../fs-open-flags.js";
|
|
10
10
|
import { sameOpenedFileIdentity } from "../fs-identity.js";
|
|
11
|
-
const PRIVATE_TREES = new Set(["sessions", "checkpoints", "index", "gateway", "cron", "weixin", "tool-results"]);
|
|
11
|
+
const PRIVATE_TREES = new Set(["sessions", "checkpoints", "index", "gateway", "cron", "weixin", "tool-results", "plugin-receipts"]);
|
|
12
12
|
const tightenedHomes = new Set();
|
|
13
13
|
const DEFAULT_MIGRATION_CAP = 50_000;
|
|
14
14
|
function isMissing(error) {
|
package/dist/serve/protocol.js
CHANGED
|
@@ -33,6 +33,8 @@
|
|
|
33
33
|
// Server → client notifications (all carry sessionId):
|
|
34
34
|
// event.text / event.reasoning {delta} · event.tool {name,preview} · event.diff {text}
|
|
35
35
|
// event.notice {text} · event.turn_end {reply,usage,error?} · approval.request {approvalId,question}
|
|
36
|
+
// event.task_state {version,taskId,turnId,objective,state,taskStatus,phase,checkpoint,…}
|
|
37
|
+
// authoritative execution plane; clients feature-detect it via capabilities.events
|
|
36
38
|
export const PROTOCOL_VERSION = 1;
|
|
37
39
|
/** JSON-RPC error codes: standard ones plus hara-specific (-320xx). */
|
|
38
40
|
export const ERR = {
|
package/dist/serve/server.js
CHANGED
|
@@ -27,10 +27,11 @@ import { loadJobs, addJob, removeJob, setEnabled } from "../cron/store.js";
|
|
|
27
27
|
import { parseSchedule, describeSchedule } from "../cron/schedule.js";
|
|
28
28
|
import { loadTasks } from "../tools/task.js";
|
|
29
29
|
import { listPending, resolvePending } from "../gateway/flows-pending.js";
|
|
30
|
-
import { disposeTodoScope, restoreTodos, serializeTodos } from "../tools/todo.js";
|
|
30
|
+
import { disposeTodoScope, onTodosChange, restoreTodos, serializeTodos } from "../tools/todo.js";
|
|
31
31
|
import { INTERJECT_PREFIX, disposeReminderScope } from "../agent/reminders.js";
|
|
32
32
|
import { SessionHub, realStore } from "./sessions.js";
|
|
33
33
|
import { parseFrame, rpcResult, rpcError, rpcNotify, ERR, PROTOCOL_VERSION } from "./protocol.js";
|
|
34
|
+
import { taskLifecycleEvent } from "./task-events.js";
|
|
34
35
|
import { readModelContextFileSync } from "../fs-read.js";
|
|
35
36
|
import { optionalPosixOpenFlag } from "../fs-open-flags.js";
|
|
36
37
|
import { sameOpenedFileIdentity } from "../fs-identity.js";
|
|
@@ -228,8 +229,15 @@ export function lastAssistantText(history) {
|
|
|
228
229
|
export function historyForClient(history) {
|
|
229
230
|
const out = [];
|
|
230
231
|
for (const m of history) {
|
|
231
|
-
if (m.role === "user")
|
|
232
|
-
|
|
232
|
+
if (m.role === "user") {
|
|
233
|
+
const steeringPrefix = `${INTERJECT_PREFIX}\n\n`;
|
|
234
|
+
out.push({
|
|
235
|
+
role: "user",
|
|
236
|
+
text: m.content.startsWith(steeringPrefix)
|
|
237
|
+
? m.content.slice(steeringPrefix.length)
|
|
238
|
+
: m.content,
|
|
239
|
+
});
|
|
240
|
+
}
|
|
233
241
|
else if (m.role === "assistant" && m.text)
|
|
234
242
|
out.push({ role: "assistant", text: m.text });
|
|
235
243
|
// tool results are omitted — clients see live tool events; persisted detail stays in the store
|
|
@@ -333,6 +341,11 @@ export async function startServe(opts, deps) {
|
|
|
333
341
|
if (ws.readyState === ws.OPEN)
|
|
334
342
|
ws.send(frame);
|
|
335
343
|
};
|
|
344
|
+
const broadcastTaskState = (session, activity) => {
|
|
345
|
+
if (!session.task)
|
|
346
|
+
return;
|
|
347
|
+
broadcast("event.task_state", { ...taskLifecycleEvent(session.meta.id, session.task, session.meta.todos ?? [], activity) });
|
|
348
|
+
};
|
|
336
349
|
// Discovery file — the desktop shell reads this to find the running server (like a pid/port file).
|
|
337
350
|
const discoveryDir = join(deps.discoveryHome ?? homedir(), ".hara");
|
|
338
351
|
const discoveryPath = join(discoveryDir, "serve.json");
|
|
@@ -413,13 +426,37 @@ export async function startServe(opts, deps) {
|
|
|
413
426
|
s.busy = false;
|
|
414
427
|
throw error;
|
|
415
428
|
}
|
|
429
|
+
let lastTaskStateSignature = "";
|
|
430
|
+
const emitTaskState = (activity, todos = s.meta.todos ?? []) => {
|
|
431
|
+
if (!s.task)
|
|
432
|
+
return;
|
|
433
|
+
const event = taskLifecycleEvent(sessionId, s.task, todos, activity);
|
|
434
|
+
const { at: _at, ...stableEvent } = event;
|
|
435
|
+
const signature = JSON.stringify(stableEvent);
|
|
436
|
+
if (signature === lastTaskStateSignature)
|
|
437
|
+
return;
|
|
438
|
+
lastTaskStateSignature = signature;
|
|
439
|
+
broadcast("event.task_state", { ...event });
|
|
440
|
+
};
|
|
416
441
|
broadcast("event.turn_start", { sessionId, taskId: s.task.id, turnId: s.task.turnId });
|
|
442
|
+
emitTaskState({ state: "running", phase: "starting" });
|
|
417
443
|
const historyStart = s.history.length;
|
|
418
444
|
const before = { input: s.stats.input, output: s.stats.output };
|
|
419
445
|
const sink = {
|
|
420
|
-
text: (d) =>
|
|
421
|
-
|
|
422
|
-
|
|
446
|
+
text: (d) => {
|
|
447
|
+
emitTaskState({ state: "running", phase: "responding" });
|
|
448
|
+
broadcast("event.text", { sessionId, delta: d });
|
|
449
|
+
},
|
|
450
|
+
reasoning: (d) => {
|
|
451
|
+
emitTaskState({ state: "running", phase: "thinking" });
|
|
452
|
+
broadcast("event.reasoning", { sessionId, delta: d });
|
|
453
|
+
},
|
|
454
|
+
tool: (name, preview) => {
|
|
455
|
+
// The task/status plane is safe for ambient surfaces such as an always-on-top companion.
|
|
456
|
+
// Command/path previews remain on the explicit event.tool transcript plane only.
|
|
457
|
+
emitTaskState({ state: "running", phase: "tool", detail: name });
|
|
458
|
+
broadcast("event.tool", { sessionId, name, preview });
|
|
459
|
+
},
|
|
423
460
|
diff: (t) => broadcast("event.diff", { sessionId, text: t }),
|
|
424
461
|
notice: (t) => broadcast("event.notice", { sessionId, text: t }),
|
|
425
462
|
};
|
|
@@ -434,6 +471,13 @@ export async function startServe(opts, deps) {
|
|
|
434
471
|
clearTimeout(timer);
|
|
435
472
|
pendingApprovals.delete(approvalId);
|
|
436
473
|
signal.removeEventListener("abort", onAbort);
|
|
474
|
+
if (!signal.aborted && s.task?.status === "running") {
|
|
475
|
+
emitTaskState({
|
|
476
|
+
state: "running",
|
|
477
|
+
phase: "thinking",
|
|
478
|
+
detail: v === false ? "Approval denied; continuing safely" : "Approval granted; continuing",
|
|
479
|
+
});
|
|
480
|
+
}
|
|
437
481
|
resolve(v);
|
|
438
482
|
};
|
|
439
483
|
const onAbort = () => finish(false);
|
|
@@ -445,15 +489,28 @@ export async function startServe(opts, deps) {
|
|
|
445
489
|
// `signal` composes the owning turn cancellation with runAgent's lifecycle cancellation. Listening
|
|
446
490
|
// only to turnAbort would leave the approval map and Desktop prompt stale after an internal stop.
|
|
447
491
|
signal.addEventListener("abort", onAbort, { once: true });
|
|
492
|
+
emitTaskState({
|
|
493
|
+
state: "waiting",
|
|
494
|
+
phase: "approval",
|
|
495
|
+
detail: q,
|
|
496
|
+
approval: { id: approvalId, question: q },
|
|
497
|
+
});
|
|
448
498
|
broadcast("approval.request", { sessionId, approvalId, question: q });
|
|
449
499
|
}
|
|
450
500
|
});
|
|
501
|
+
let stopTodoEvents = () => { };
|
|
451
502
|
try {
|
|
452
503
|
if (!(await refreshSessionProvider(s))) {
|
|
453
504
|
throw new Error(`provider not authenticated for pinned model '${s.meta.model}' at ${s.meta.cwd}`);
|
|
454
505
|
}
|
|
455
506
|
const turnGuardian = deps.buildGuardian ? await deps.buildGuardian(s.meta.cwd) : deps.guardian;
|
|
456
507
|
restoreTodos(s.meta.todos, sessionId);
|
|
508
|
+
stopTodoEvents = onTodosChange((todos) => {
|
|
509
|
+
// Keep the session snapshot current while the turn runs. Steering and task-intake checkpoints can
|
|
510
|
+
// then publish/persist the same checklist the model just wrote instead of regressing to turn-start.
|
|
511
|
+
s.meta.todos = serializeTodos(sessionId);
|
|
512
|
+
emitTaskState({ state: "running", phase: "checkpoint" }, s.meta.todos);
|
|
513
|
+
}, sessionId);
|
|
457
514
|
// Slash skills, CLI parity: "/skill-id request…" expands into the skill-entering message, so a
|
|
458
515
|
// desktop composer's "/" popup triggers the exact behavior the terminal gets. Unknown ids fall
|
|
459
516
|
// through as plain text (the model sees what the user typed).
|
|
@@ -495,10 +552,12 @@ export async function startServe(opts, deps) {
|
|
|
495
552
|
current: () => s.task,
|
|
496
553
|
onUpdate: (next) => {
|
|
497
554
|
s.task = next;
|
|
555
|
+
emitTaskState({ state: "running", phase: "checkpoint" }, serializeTodos(sessionId));
|
|
498
556
|
},
|
|
499
557
|
onCheckpoint: (next) => {
|
|
500
558
|
s.task = next;
|
|
501
559
|
hub.save(s);
|
|
560
|
+
emitTaskState({ state: "running", phase: "checkpoint" }, serializeTodos(sessionId));
|
|
502
561
|
},
|
|
503
562
|
},
|
|
504
563
|
pendingInput: async () => {
|
|
@@ -521,6 +580,7 @@ export async function startServe(opts, deps) {
|
|
|
521
580
|
s.meta.todos = serializeTodos(sessionId);
|
|
522
581
|
s.task = finishTaskExecution(s.task, outcome, s.meta.todos, turnAbort.signal.aborted);
|
|
523
582
|
hub.save(s);
|
|
583
|
+
emitTaskState({ phase: "finished" }, s.meta.todos);
|
|
524
584
|
const usage = { input: s.stats.input - before.input, output: s.stats.output - before.output };
|
|
525
585
|
// context watermark rides along with every turn end (codex thread/tokenUsage/updated pattern) —
|
|
526
586
|
// clients render a meter without an extra round-trip.
|
|
@@ -544,10 +604,12 @@ export async function startServe(opts, deps) {
|
|
|
544
604
|
if (s.task?.status === "running") {
|
|
545
605
|
s.task = finishTaskExecution(s.task, { status: "error", error: error instanceof Error ? error.message : String(error) }, s.meta.todos ?? [], turnAbort.signal.aborted);
|
|
546
606
|
hub.save(s);
|
|
607
|
+
emitTaskState({ phase: "finished" }, s.meta.todos ?? []);
|
|
547
608
|
}
|
|
548
609
|
throw error;
|
|
549
610
|
}
|
|
550
611
|
finally {
|
|
612
|
+
stopTodoEvents();
|
|
551
613
|
s.abort = null;
|
|
552
614
|
s.busy = s.pendingProviderTurns > 0 || s.pendingToolRuns > 0;
|
|
553
615
|
}
|
|
@@ -682,7 +744,7 @@ export async function startServe(opts, deps) {
|
|
|
682
744
|
provider: runtime.providerId,
|
|
683
745
|
model: runtime.model,
|
|
684
746
|
setupState,
|
|
685
|
-
capabilities: { methods },
|
|
747
|
+
capabilities: { methods, events: ["event.task_state"] },
|
|
686
748
|
}));
|
|
687
749
|
}
|
|
688
750
|
if (!authed.has(ws))
|
|
@@ -749,6 +811,7 @@ export async function startServe(opts, deps) {
|
|
|
749
811
|
return reply(rpcError(id, ERR.INTERNAL, `provider not authenticated for pinned model '${r.session.meta.model}'`));
|
|
750
812
|
}
|
|
751
813
|
r.session.projectContext = loadAgentContext(r.session.meta.cwd) || undefined;
|
|
814
|
+
broadcastTaskState(r.session, { phase: "restored" });
|
|
752
815
|
return reply(rpcResult(id, {
|
|
753
816
|
sessionId: r.session.meta.id,
|
|
754
817
|
model: r.session.meta.model,
|
|
@@ -791,12 +854,16 @@ export async function startServe(opts, deps) {
|
|
|
791
854
|
return reply(rpcError(id, ERR.BUSY, recorded.reason));
|
|
792
855
|
s.task = recorded.task;
|
|
793
856
|
hub.save(s); // executable inbox entry is durable before ACK
|
|
857
|
+
broadcastTaskState(s, { state: "running", phase: "steering", detail: "Steering accepted" });
|
|
794
858
|
return reply(rpcResult(id, { accepted: true, taskId: s.task.id, turnId: s.task.turnId }));
|
|
795
859
|
}
|
|
796
860
|
case "session.interrupt": {
|
|
797
861
|
const s = typeof p.sessionId === "string" ? hub.get(p.sessionId) : undefined;
|
|
798
862
|
if (!s)
|
|
799
863
|
return reply(rpcError(id, ERR.NO_SESSION, "no such live session"));
|
|
864
|
+
if (s.abort && s.task?.status === "running") {
|
|
865
|
+
broadcastTaskState(s, { state: "running", phase: "stopping", detail: "Stopping at a safe boundary" });
|
|
866
|
+
}
|
|
800
867
|
s.abort?.abort();
|
|
801
868
|
return reply(rpcResult(id, {}));
|
|
802
869
|
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
export const TASK_LIFECYCLE_EVENT_VERSION = 1;
|
|
2
|
+
function bounded(value, max) {
|
|
3
|
+
const normalized = value?.replace(/\s+/g, " ").trim();
|
|
4
|
+
return normalized ? normalized.slice(0, max) : undefined;
|
|
5
|
+
}
|
|
6
|
+
/** Build the single task-state shape consumed by Desktop, IDE clients, and the companion. Conversation
|
|
7
|
+
* streaming remains separate; this event is the authoritative execution/status plane. */
|
|
8
|
+
export function taskLifecycleEvent(sessionId, task, todos = [], activity, at = new Date().toISOString()) {
|
|
9
|
+
const current = todos.find((todo) => todo.status === "in_progress")
|
|
10
|
+
?? todos.find((todo) => todo.status === "pending");
|
|
11
|
+
const detail = bounded(activity.detail, 500);
|
|
12
|
+
const approval = activity.approval
|
|
13
|
+
? {
|
|
14
|
+
id: activity.approval.id,
|
|
15
|
+
question: bounded(activity.approval.question, 4_000) ?? "Approval required",
|
|
16
|
+
}
|
|
17
|
+
: undefined;
|
|
18
|
+
// Runtime phases may only refine an actively running task. Once durable state reaches a terminal or
|
|
19
|
+
// resumable boundary, a late notification cannot visually resurrect it as running/waiting.
|
|
20
|
+
const state = task.status === "running"
|
|
21
|
+
? (activity.state ?? task.status)
|
|
22
|
+
: task.status;
|
|
23
|
+
return {
|
|
24
|
+
version: TASK_LIFECYCLE_EVENT_VERSION,
|
|
25
|
+
sessionId,
|
|
26
|
+
taskId: task.id,
|
|
27
|
+
turnId: task.turnId,
|
|
28
|
+
objective: task.objective,
|
|
29
|
+
state,
|
|
30
|
+
taskStatus: task.status,
|
|
31
|
+
phase: activity.phase,
|
|
32
|
+
at,
|
|
33
|
+
updatedAt: task.updatedAt,
|
|
34
|
+
...(task.lastOutcome ? { lastOutcome: task.lastOutcome } : {}),
|
|
35
|
+
...(task.brief ? { brief: { intent: task.brief.intent, goal: task.brief.goal } } : {}),
|
|
36
|
+
checkpoint: {
|
|
37
|
+
done: todos.filter((todo) => todo.status === "done").length,
|
|
38
|
+
total: todos.length,
|
|
39
|
+
...(current ? { current: bounded(current.activeForm || current.text, 300) } : {}),
|
|
40
|
+
...(current?.owner ? { owner: bounded(current.owner, 120) } : {}),
|
|
41
|
+
},
|
|
42
|
+
...(detail ? { detail } : {}),
|
|
43
|
+
...(approval ? { approval } : {}),
|
|
44
|
+
};
|
|
45
|
+
}
|