@roackb2/heddle 0.0.27 → 0.0.29
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 +65 -11
- package/dist/examples/programmatic-loop.js +12 -0
- package/dist/examples/programmatic-loop.js.map +1 -1
- package/dist/src/cli/ask.d.ts +2 -0
- package/dist/src/cli/ask.d.ts.map +1 -1
- package/dist/src/cli/ask.js +107 -5
- package/dist/src/cli/ask.js.map +1 -1
- package/dist/src/cli/chat/App.d.ts.map +1 -1
- package/dist/src/cli/chat/App.js +16 -4
- package/dist/src/cli/chat/App.js.map +1 -1
- package/dist/src/cli/chat/components/RuntimeHostInterstitial.d.ts +7 -0
- package/dist/src/cli/chat/components/RuntimeHostInterstitial.d.ts.map +1 -0
- package/dist/src/cli/chat/components/RuntimeHostInterstitial.js +22 -0
- package/dist/src/cli/chat/components/RuntimeHostInterstitial.js.map +1 -0
- package/dist/src/cli/chat/components/index.d.ts +1 -0
- package/dist/src/cli/chat/components/index.d.ts.map +1 -1
- package/dist/src/cli/chat/components/index.js +1 -0
- package/dist/src/cli/chat/components/index.js.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts +1 -0
- package/dist/src/cli/chat/hooks/useAgentRun.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useAgentRun.js +118 -1
- package/dist/src/cli/chat/hooks/useAgentRun.js.map +1 -1
- package/dist/src/cli/chat/hooks/useApprovalFlow.d.ts +1 -0
- package/dist/src/cli/chat/hooks/useApprovalFlow.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useApprovalFlow.js +3 -0
- package/dist/src/cli/chat/hooks/useApprovalFlow.js.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.d.ts +3 -1
- package/dist/src/cli/chat/hooks/useChatSessions.d.ts.map +1 -1
- package/dist/src/cli/chat/hooks/useChatSessions.js +7 -2
- package/dist/src/cli/chat/hooks/useChatSessions.js.map +1 -1
- package/dist/src/cli/chat/utils/format.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/format.js +8 -0
- package/dist/src/cli/chat/utils/format.js.map +1 -1
- package/dist/src/cli/chat/utils/runtime.d.ts +3 -0
- package/dist/src/cli/chat/utils/runtime.d.ts.map +1 -1
- package/dist/src/cli/chat/utils/runtime.js +8 -3
- package/dist/src/cli/chat/utils/runtime.js.map +1 -1
- package/dist/src/cli/daemon.d.ts +1 -0
- package/dist/src/cli/daemon.d.ts.map +1 -1
- package/dist/src/cli/daemon.js +6 -1
- package/dist/src/cli/daemon.js.map +1 -1
- package/dist/src/cli/heartbeat/task-commands.d.ts.map +1 -1
- package/dist/src/cli/heartbeat/task-commands.js +10 -1
- package/dist/src/cli/heartbeat/task-commands.js.map +1 -1
- package/dist/src/cli/heartbeat/worker.d.ts.map +1 -1
- package/dist/src/cli/heartbeat/worker.js +9 -1
- package/dist/src/cli/heartbeat/worker.js.map +1 -1
- package/dist/src/cli/main.js +304 -7
- package/dist/src/cli/main.js.map +1 -1
- package/dist/src/cli/remote/control-plane-client.d.ts +290 -0
- package/dist/src/cli/remote/control-plane-client.d.ts.map +1 -0
- package/dist/src/cli/remote/control-plane-client.js +11 -0
- package/dist/src/cli/remote/control-plane-client.js.map +1 -0
- package/dist/src/core/agent/mutation-tracking.d.ts.map +1 -1
- package/dist/src/core/agent/mutation-tracking.js +3 -0
- package/dist/src/core/agent/mutation-tracking.js.map +1 -1
- package/dist/src/core/agent/post-mutation.js +2 -2
- package/dist/src/core/agent/post-mutation.js.map +1 -1
- package/dist/src/core/agent/run-agent.d.ts.map +1 -1
- package/dist/src/core/agent/run-agent.js +132 -28
- package/dist/src/core/agent/run-agent.js.map +1 -1
- package/dist/src/core/chat/conversation-lines.d.ts.map +1 -1
- package/dist/src/core/chat/conversation-lines.js +1 -26
- package/dist/src/core/chat/conversation-lines.js.map +1 -1
- package/dist/src/core/chat/session-lease.d.ts +23 -0
- package/dist/src/core/chat/session-lease.d.ts.map +1 -0
- package/dist/src/core/chat/session-lease.js +72 -0
- package/dist/src/core/chat/session-lease.js.map +1 -0
- package/dist/src/core/chat/session-submit.d.ts +5 -0
- package/dist/src/core/chat/session-submit.d.ts.map +1 -1
- package/dist/src/core/chat/session-submit.js +243 -108
- package/dist/src/core/chat/session-submit.js.map +1 -1
- package/dist/src/core/chat/storage.d.ts +4 -1
- package/dist/src/core/chat/storage.d.ts.map +1 -1
- package/dist/src/core/chat/storage.js +31 -0
- package/dist/src/core/chat/storage.js.map +1 -1
- package/dist/src/core/chat/trace-summary.d.ts.map +1 -1
- package/dist/src/core/chat/trace-summary.js +10 -0
- package/dist/src/core/chat/trace-summary.js.map +1 -1
- package/dist/src/core/chat/types.d.ts +9 -0
- package/dist/src/core/chat/types.d.ts.map +1 -1
- package/dist/src/core/memory/catalog.d.ts +46 -0
- package/dist/src/core/memory/catalog.d.ts.map +1 -0
- package/dist/src/core/memory/catalog.js +230 -0
- package/dist/src/core/memory/catalog.js.map +1 -0
- package/dist/src/core/memory/domain-prompt.d.ts +2 -0
- package/dist/src/core/memory/domain-prompt.d.ts.map +1 -0
- package/dist/src/core/memory/domain-prompt.js +35 -0
- package/dist/src/core/memory/domain-prompt.js.map +1 -0
- package/dist/src/core/memory/maintainer-tools.d.ts +5 -0
- package/dist/src/core/memory/maintainer-tools.d.ts.map +1 -0
- package/dist/src/core/memory/maintainer-tools.js +10 -0
- package/dist/src/core/memory/maintainer-tools.js.map +1 -0
- package/dist/src/core/memory/maintainer.d.ts +45 -0
- package/dist/src/core/memory/maintainer.d.ts.map +1 -0
- package/dist/src/core/memory/maintainer.js +204 -0
- package/dist/src/core/memory/maintainer.js.map +1 -0
- package/dist/src/core/memory/maintenance-integration.d.ts +20 -0
- package/dist/src/core/memory/maintenance-integration.d.ts.map +1 -0
- package/dist/src/core/memory/maintenance-integration.js +189 -0
- package/dist/src/core/memory/maintenance-integration.js.map +1 -0
- package/dist/src/core/memory/templates.d.ts +9 -0
- package/dist/src/core/memory/templates.d.ts.map +1 -0
- package/dist/src/core/memory/templates.js +32 -0
- package/dist/src/core/memory/templates.js.map +1 -0
- package/dist/src/core/memory/validation.d.ts +39 -0
- package/dist/src/core/memory/validation.d.ts.map +1 -0
- package/dist/src/core/memory/validation.js +94 -0
- package/dist/src/core/memory/validation.js.map +1 -0
- package/dist/src/core/memory/visibility.d.ts +42 -0
- package/dist/src/core/memory/visibility.d.ts.map +1 -0
- package/dist/src/core/memory/visibility.js +156 -0
- package/dist/src/core/memory/visibility.js.map +1 -0
- package/dist/src/core/prompts/system-prompt.d.ts.map +1 -1
- package/dist/src/core/prompts/system-prompt.js +0 -10
- package/dist/src/core/prompts/system-prompt.js.map +1 -1
- package/dist/src/core/runtime/daemon-registry.d.ts +39 -0
- package/dist/src/core/runtime/daemon-registry.d.ts.map +1 -0
- package/dist/src/core/runtime/daemon-registry.js +120 -0
- package/dist/src/core/runtime/daemon-registry.js.map +1 -0
- package/dist/src/core/runtime/default-tools.d.ts +1 -0
- package/dist/src/core/runtime/default-tools.d.ts.map +1 -1
- package/dist/src/core/runtime/default-tools.js +22 -4
- package/dist/src/core/runtime/default-tools.js.map +1 -1
- package/dist/src/core/runtime/heartbeat-task-store.d.ts +2 -0
- package/dist/src/core/runtime/heartbeat-task-store.d.ts.map +1 -1
- package/dist/src/core/runtime/heartbeat-task-store.js +1 -0
- package/dist/src/core/runtime/heartbeat-task-store.js.map +1 -1
- package/dist/src/core/runtime/heartbeat-views.d.ts +2 -0
- package/dist/src/core/runtime/heartbeat-views.d.ts.map +1 -1
- package/dist/src/core/runtime/heartbeat-views.js +2 -0
- package/dist/src/core/runtime/heartbeat-views.js.map +1 -1
- package/dist/src/core/runtime/heartbeat.d.ts.map +1 -1
- package/dist/src/core/runtime/heartbeat.js +9 -2
- package/dist/src/core/runtime/heartbeat.js.map +1 -1
- package/dist/src/core/runtime/runtime-hosts.d.ts +30 -0
- package/dist/src/core/runtime/runtime-hosts.d.ts.map +1 -0
- package/dist/src/core/runtime/runtime-hosts.js +95 -0
- package/dist/src/core/runtime/runtime-hosts.js.map +1 -0
- package/dist/src/core/runtime/workspaces.d.ts +48 -0
- package/dist/src/core/runtime/workspaces.d.ts.map +1 -0
- package/dist/src/core/runtime/workspaces.js +139 -0
- package/dist/src/core/runtime/workspaces.js.map +1 -0
- package/dist/src/core/tools/file-edit-core.d.ts +1 -0
- package/dist/src/core/tools/file-edit-core.d.ts.map +1 -1
- package/dist/src/core/tools/file-edit-core.js +10 -0
- package/dist/src/core/tools/file-edit-core.js.map +1 -1
- package/dist/src/core/tools/memory-checkpoint.d.ts +8 -0
- package/dist/src/core/tools/memory-checkpoint.d.ts.map +1 -0
- package/dist/src/core/tools/memory-checkpoint.js +131 -0
- package/dist/src/core/tools/memory-checkpoint.js.map +1 -0
- package/dist/src/core/tools/memory-notes.d.ts.map +1 -1
- package/dist/src/core/tools/memory-notes.js +4 -3
- package/dist/src/core/tools/memory-notes.js.map +1 -1
- package/dist/src/core/tools/record-knowledge.d.ts +9 -0
- package/dist/src/core/tools/record-knowledge.d.ts.map +1 -0
- package/dist/src/core/tools/record-knowledge.js +177 -0
- package/dist/src/core/tools/record-knowledge.js.map +1 -0
- package/dist/src/core/types.d.ts +33 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/index.d.ts +13 -0
- package/dist/src/index.d.ts.map +1 -1
- package/dist/src/index.js +8 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/server/app.d.ts +5 -2
- package/dist/src/server/app.d.ts.map +1 -1
- package/dist/src/server/app.js +31 -7
- package/dist/src/server/app.js.map +1 -1
- package/dist/src/server/features/control-plane/router.d.ts +88 -0
- package/dist/src/server/features/control-plane/router.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/router.js +131 -18
- package/dist/src/server/features/control-plane/router.js.map +1 -1
- package/dist/src/server/features/control-plane/services/ask.d.ts +17 -0
- package/dist/src/server/features/control-plane/services/ask.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/services/ask.js +63 -0
- package/dist/src/server/features/control-plane/services/ask.js.map +1 -0
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts +8 -0
- package/dist/src/server/features/control-plane/services/chat-sessions.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/chat-sessions.js +6 -2
- package/dist/src/server/features/control-plane/services/chat-sessions.js.map +1 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.d.ts.map +1 -1
- package/dist/src/server/features/control-plane/services/control-plane-state.js +15 -6
- package/dist/src/server/features/control-plane/services/control-plane-state.js.map +1 -1
- package/dist/src/server/features/control-plane/services/memory.d.ts +22 -0
- package/dist/src/server/features/control-plane/services/memory.d.ts.map +1 -0
- package/dist/src/server/features/control-plane/services/memory.js +36 -0
- package/dist/src/server/features/control-plane/services/memory.js.map +1 -0
- package/dist/src/server/features/control-plane/types.d.ts +19 -0
- package/dist/src/server/features/control-plane/types.d.ts.map +1 -1
- package/dist/src/server/index.d.ts.map +1 -1
- package/dist/src/server/index.js +114 -6
- package/dist/src/server/index.js.map +1 -1
- package/dist/src/server/router.d.ts +92 -0
- package/dist/src/server/router.d.ts.map +1 -1
- package/dist/src/server/router.js +4 -0
- package/dist/src/server/router.js.map +1 -1
- package/dist/src/server/static.d.ts.map +1 -1
- package/dist/src/server/static.js +7 -5
- package/dist/src/server/static.js.map +1 -1
- package/dist/src/server/types.d.ts +22 -0
- package/dist/src/server/types.d.ts.map +1 -1
- package/dist/src/web/assets/index-BCCIDJRN.js +52 -0
- package/dist/src/web/assets/index-DarVaee6.css +2 -0
- package/dist/src/web/index.html +2 -2
- package/package.json +16 -2
- package/dist/src/web/assets/index-BPZ31ir-.js +0 -12
- package/dist/src/web/assets/index-C9sFoCL6.css +0 -2
|
@@ -1,7 +1,14 @@
|
|
|
1
|
+
import { resolve } from 'node:path';
|
|
2
|
+
import { appendMemoryCatalogSystemContext } from '../memory/catalog.js';
|
|
1
3
|
import { runAgentLoop } from './agent-loop.js';
|
|
2
4
|
import { createAgentLoopCheckpoint } from './events.js';
|
|
3
5
|
const DEFAULT_HEARTBEAT_MAX_STEPS = 80;
|
|
4
6
|
export async function runAgentHeartbeat(options) {
|
|
7
|
+
const memoryDir = options.memoryDir ?? resolve(options.workspaceRoot ?? process.cwd(), options.stateDir ?? '.heddle', 'memory');
|
|
8
|
+
const systemContext = appendHeartbeatSystemContext(appendMemoryCatalogSystemContext({
|
|
9
|
+
systemContext: options.systemContext,
|
|
10
|
+
memoryRoot: memoryDir,
|
|
11
|
+
}));
|
|
5
12
|
const result = await runAgentLoop({
|
|
6
13
|
goal: buildHeartbeatGoal(options.task),
|
|
7
14
|
model: options.model,
|
|
@@ -9,9 +16,9 @@ export async function runAgentHeartbeat(options) {
|
|
|
9
16
|
maxSteps: options.maxSteps ?? DEFAULT_HEARTBEAT_MAX_STEPS,
|
|
10
17
|
workspaceRoot: options.workspaceRoot,
|
|
11
18
|
stateDir: options.stateDir,
|
|
12
|
-
memoryDir
|
|
19
|
+
memoryDir,
|
|
13
20
|
searchIgnoreDirs: options.searchIgnoreDirs,
|
|
14
|
-
systemContext
|
|
21
|
+
systemContext,
|
|
15
22
|
history: options.history,
|
|
16
23
|
resumeFrom: options.checkpoint,
|
|
17
24
|
llm: options.llm,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../../../src/core/runtime/heartbeat.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../../../src/core/runtime/heartbeat.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
export type ResolvedRuntimeHost = {
|
|
2
|
+
kind: 'none';
|
|
3
|
+
registryPath: string;
|
|
4
|
+
workspaceId: string;
|
|
5
|
+
} | {
|
|
6
|
+
kind: 'daemon';
|
|
7
|
+
registryPath: string;
|
|
8
|
+
workspaceId: string;
|
|
9
|
+
ownerId: string;
|
|
10
|
+
endpoint: {
|
|
11
|
+
host: string;
|
|
12
|
+
port: number;
|
|
13
|
+
};
|
|
14
|
+
startedAt: string;
|
|
15
|
+
lastSeenAt: string;
|
|
16
|
+
stale: boolean;
|
|
17
|
+
ageMs: number;
|
|
18
|
+
};
|
|
19
|
+
export declare function resolveWorkspaceRuntimeHost(options: {
|
|
20
|
+
workspaceRoot: string;
|
|
21
|
+
stateRoot: string;
|
|
22
|
+
registryPath?: string;
|
|
23
|
+
now?: number;
|
|
24
|
+
staleAfterMs?: number;
|
|
25
|
+
isPidAlive?: (pid: number) => boolean;
|
|
26
|
+
}): ResolvedRuntimeHost;
|
|
27
|
+
export declare function formatRuntimeHostNotice(command: string, host: ResolvedRuntimeHost): string | undefined;
|
|
28
|
+
export declare function embeddedCommandConflictMessage(command: string, host: ResolvedRuntimeHost): string | undefined;
|
|
29
|
+
export declare function daemonStartConflictMessage(host: ResolvedRuntimeHost): string | undefined;
|
|
30
|
+
//# sourceMappingURL=runtime-hosts.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-hosts.d.ts","sourceRoot":"","sources":["../../../../src/core/runtime/runtime-hosts.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,mBAAmB,GAC3B;IACE,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;CACrB,GACD;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE;QACR,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;IACF,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEN,wBAAgB,2BAA2B,CAAC,OAAO,EAAE;IACnD,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;CACvC,GAAG,mBAAmB,CAsCtB;AAkBD,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAmBtG;AAED,wBAAgB,8BAA8B,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAW7G;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,mBAAmB,GAAG,MAAM,GAAG,SAAS,CAWxF"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { readDaemonWorkspaceRegistration, resolveDaemonRegistryPath } from './daemon-registry.js';
|
|
2
|
+
import { resolveWorkspaceContext } from './workspaces.js';
|
|
3
|
+
const DEFAULT_STALE_AFTER_MS = 45_000;
|
|
4
|
+
export function resolveWorkspaceRuntimeHost(options) {
|
|
5
|
+
const workspace = resolveWorkspaceContext({
|
|
6
|
+
workspaceRoot: options.workspaceRoot,
|
|
7
|
+
stateRoot: options.stateRoot,
|
|
8
|
+
}).activeWorkspace;
|
|
9
|
+
const registryPath = options.registryPath ?? resolveDaemonRegistryPath();
|
|
10
|
+
const registration = readDaemonWorkspaceRegistration(registryPath, workspace.id);
|
|
11
|
+
const owner = registration?.owner;
|
|
12
|
+
if (!owner) {
|
|
13
|
+
return {
|
|
14
|
+
kind: 'none',
|
|
15
|
+
registryPath,
|
|
16
|
+
workspaceId: workspace.id,
|
|
17
|
+
};
|
|
18
|
+
}
|
|
19
|
+
const now = options.now ?? Date.now();
|
|
20
|
+
const lastSeenAt = Date.parse(owner.lastSeenAt);
|
|
21
|
+
const ageMs = Number.isFinite(lastSeenAt) ? Math.max(0, now - lastSeenAt) : Number.POSITIVE_INFINITY;
|
|
22
|
+
const staleByAge = ageMs > (options.staleAfterMs ?? DEFAULT_STALE_AFTER_MS);
|
|
23
|
+
const pidAlive = owner.pid > 0 ? (options.isPidAlive ?? isPidAlive)(owner.pid) : true;
|
|
24
|
+
const stale = staleByAge || !pidAlive;
|
|
25
|
+
return {
|
|
26
|
+
kind: 'daemon',
|
|
27
|
+
registryPath,
|
|
28
|
+
workspaceId: workspace.id,
|
|
29
|
+
ownerId: owner.ownerId,
|
|
30
|
+
endpoint: {
|
|
31
|
+
host: owner.host,
|
|
32
|
+
port: owner.port,
|
|
33
|
+
},
|
|
34
|
+
startedAt: owner.startedAt,
|
|
35
|
+
lastSeenAt: owner.lastSeenAt,
|
|
36
|
+
stale,
|
|
37
|
+
ageMs,
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
function isPidAlive(pid) {
|
|
41
|
+
try {
|
|
42
|
+
process.kill(pid, 0);
|
|
43
|
+
return true;
|
|
44
|
+
}
|
|
45
|
+
catch (error) {
|
|
46
|
+
if (isNodeError(error) && error.code === 'EPERM') {
|
|
47
|
+
return true;
|
|
48
|
+
}
|
|
49
|
+
return false;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
function isNodeError(error) {
|
|
53
|
+
return typeof error === 'object' && error !== null && 'code' in error;
|
|
54
|
+
}
|
|
55
|
+
export function formatRuntimeHostNotice(command, host) {
|
|
56
|
+
if (host.kind !== 'daemon' || host.stale) {
|
|
57
|
+
return undefined;
|
|
58
|
+
}
|
|
59
|
+
if (command === 'chat') {
|
|
60
|
+
return [
|
|
61
|
+
'Heddle notice: a live daemon is attached to this workspace.',
|
|
62
|
+
`daemon=http://${host.endpoint.host}:${host.endpoint.port}`,
|
|
63
|
+
`workspace=${host.workspaceId}`,
|
|
64
|
+
'Embedded chat still works here; avoid writing to the same session from multiple clients.',
|
|
65
|
+
].join(' ');
|
|
66
|
+
}
|
|
67
|
+
return [
|
|
68
|
+
`Heddle notice: workspace is currently owned by a daemon for \`${command}\`.`,
|
|
69
|
+
`daemon=http://${host.endpoint.host}:${host.endpoint.port}`,
|
|
70
|
+
`workspace=${host.workspaceId}`,
|
|
71
|
+
].join(' ');
|
|
72
|
+
}
|
|
73
|
+
export function embeddedCommandConflictMessage(command, host) {
|
|
74
|
+
if (host.kind !== 'daemon' || host.stale) {
|
|
75
|
+
return undefined;
|
|
76
|
+
}
|
|
77
|
+
return [
|
|
78
|
+
`Workspace ${host.workspaceId} is currently owned by a live Heddle daemon.`,
|
|
79
|
+
`Refusing embedded \`${command}\` to avoid conflicting runtime owners.`,
|
|
80
|
+
`daemon=http://${host.endpoint.host}:${host.endpoint.port}`,
|
|
81
|
+
'Use the daemon-backed control plane, stop the daemon, or rerun with `--force-owner-conflict`.',
|
|
82
|
+
].join(' ');
|
|
83
|
+
}
|
|
84
|
+
export function daemonStartConflictMessage(host) {
|
|
85
|
+
if (host.kind !== 'daemon' || host.stale) {
|
|
86
|
+
return undefined;
|
|
87
|
+
}
|
|
88
|
+
return [
|
|
89
|
+
`Workspace ${host.workspaceId} is already owned by a live Heddle daemon.`,
|
|
90
|
+
`Refusing to start a second daemon.`,
|
|
91
|
+
`daemon=http://${host.endpoint.host}:${host.endpoint.port}`,
|
|
92
|
+
'Stop the existing daemon first or rerun with `--force-owner-conflict`.',
|
|
93
|
+
].join(' ');
|
|
94
|
+
}
|
|
95
|
+
//# sourceMappingURL=runtime-hosts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-hosts.js","sourceRoot":"","sources":["../../../../src/core/runtime/runtime-hosts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
export declare const DEFAULT_WORKSPACE_ID = "default";
|
|
2
|
+
export type WorkspaceDescriptor = {
|
|
3
|
+
id: string;
|
|
4
|
+
name: string;
|
|
5
|
+
anchorRoot: string;
|
|
6
|
+
repoRoots: string[];
|
|
7
|
+
stateRoot: string;
|
|
8
|
+
createdAt: string;
|
|
9
|
+
updatedAt: string;
|
|
10
|
+
};
|
|
11
|
+
export type WorkspaceCatalog = {
|
|
12
|
+
version: 1;
|
|
13
|
+
activeWorkspaceId: string;
|
|
14
|
+
workspaces: WorkspaceDescriptor[];
|
|
15
|
+
};
|
|
16
|
+
export type ResolvedWorkspaceContext = {
|
|
17
|
+
catalogPath: string;
|
|
18
|
+
catalog: WorkspaceCatalog;
|
|
19
|
+
activeWorkspaceId: string;
|
|
20
|
+
activeWorkspace: WorkspaceDescriptor;
|
|
21
|
+
workspaces: WorkspaceDescriptor[];
|
|
22
|
+
};
|
|
23
|
+
export declare function ensureWorkspaceCatalog(options: {
|
|
24
|
+
workspaceRoot: string;
|
|
25
|
+
stateRoot: string;
|
|
26
|
+
}): WorkspaceCatalog;
|
|
27
|
+
export declare function resolveWorkspaceContext(options: {
|
|
28
|
+
workspaceRoot: string;
|
|
29
|
+
stateRoot: string;
|
|
30
|
+
}): ResolvedWorkspaceContext;
|
|
31
|
+
export declare function resolveWorkspaceCatalogPath(stateRoot: string): string;
|
|
32
|
+
export declare function setActiveWorkspace(options: {
|
|
33
|
+
workspaceRoot: string;
|
|
34
|
+
stateRoot: string;
|
|
35
|
+
workspaceId: string;
|
|
36
|
+
}): ResolvedWorkspaceContext;
|
|
37
|
+
export declare function createWorkspaceDescriptor(options: {
|
|
38
|
+
workspaceRoot: string;
|
|
39
|
+
stateRoot: string;
|
|
40
|
+
name: string;
|
|
41
|
+
anchorRoot: string;
|
|
42
|
+
repoRoots?: string[];
|
|
43
|
+
nextId?: string;
|
|
44
|
+
setActive?: boolean;
|
|
45
|
+
}): ResolvedWorkspaceContext;
|
|
46
|
+
export declare function readWorkspaceCatalog(catalogPath: string): WorkspaceCatalog;
|
|
47
|
+
export declare function saveWorkspaceCatalog(catalogPath: string, catalog: WorkspaceCatalog): void;
|
|
48
|
+
//# sourceMappingURL=workspaces.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspaces.d.ts","sourceRoot":"","sources":["../../../../src/core/runtime/workspaces.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,oBAAoB,YAAY,CAAC;AAE9C,MAAM,MAAM,mBAAmB,GAAG;IAChC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,CAAC,CAAC;IACX,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,mBAAmB,EAAE,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,gBAAgB,CAAC;IAC1B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,eAAe,EAAE,mBAAmB,CAAC;IACrC,UAAU,EAAE,mBAAmB,EAAE,CAAC;CACnC,CAAC;AAEF,wBAAgB,sBAAsB,CAAC,OAAO,EAAE;IAC9C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,gBAAgB,CAiBnB;AAED,wBAAgB,uBAAuB,CAAC,OAAO,EAAE;IAC/C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;CACnB,GAAG,wBAAwB,CAgB3B;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAErE;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;CACrB,GAAG,wBAAwB,CAY3B;AAED,wBAAgB,yBAAyB,CAAC,OAAO,EAAE;IACjD,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,GAAG,wBAAwB,CAwB3B;AA0BD,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,CAE1E;AAED,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,QAGlF"}
|
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
|
|
2
|
+
import { basename, dirname, join, resolve } from 'node:path';
|
|
3
|
+
export const DEFAULT_WORKSPACE_ID = 'default';
|
|
4
|
+
export function ensureWorkspaceCatalog(options) {
|
|
5
|
+
const workspaceRoot = resolve(options.workspaceRoot);
|
|
6
|
+
const stateRoot = resolve(options.stateRoot);
|
|
7
|
+
const catalogPath = resolveWorkspaceCatalogPath(stateRoot);
|
|
8
|
+
if (!existsSync(catalogPath)) {
|
|
9
|
+
const catalog = createDefaultWorkspaceCatalog(workspaceRoot, stateRoot);
|
|
10
|
+
saveWorkspaceCatalog(catalogPath, catalog);
|
|
11
|
+
return catalog;
|
|
12
|
+
}
|
|
13
|
+
const parsed = readWorkspaceCatalog(catalogPath);
|
|
14
|
+
const normalized = normalizeWorkspaceCatalog(parsed, workspaceRoot, stateRoot);
|
|
15
|
+
if (JSON.stringify(parsed) !== JSON.stringify(normalized)) {
|
|
16
|
+
saveWorkspaceCatalog(catalogPath, normalized);
|
|
17
|
+
}
|
|
18
|
+
return normalized;
|
|
19
|
+
}
|
|
20
|
+
export function resolveWorkspaceContext(options) {
|
|
21
|
+
const catalog = ensureWorkspaceCatalog(options);
|
|
22
|
+
const activeWorkspace = catalog.workspaces.find((workspace) => workspace.id === catalog.activeWorkspaceId)
|
|
23
|
+
?? catalog.workspaces[0];
|
|
24
|
+
if (!activeWorkspace) {
|
|
25
|
+
throw new Error('Failed to resolve active workspace descriptor.');
|
|
26
|
+
}
|
|
27
|
+
return {
|
|
28
|
+
catalogPath: resolveWorkspaceCatalogPath(options.stateRoot),
|
|
29
|
+
catalog,
|
|
30
|
+
activeWorkspaceId: activeWorkspace.id,
|
|
31
|
+
activeWorkspace,
|
|
32
|
+
workspaces: catalog.workspaces,
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
export function resolveWorkspaceCatalogPath(stateRoot) {
|
|
36
|
+
return join(stateRoot, 'workspaces.catalog.json');
|
|
37
|
+
}
|
|
38
|
+
export function setActiveWorkspace(options) {
|
|
39
|
+
const resolved = resolveWorkspaceContext(options);
|
|
40
|
+
if (!resolved.workspaces.some((workspace) => workspace.id === options.workspaceId)) {
|
|
41
|
+
throw new Error(`Workspace not found: ${options.workspaceId}`);
|
|
42
|
+
}
|
|
43
|
+
const nextCatalog = {
|
|
44
|
+
...resolved.catalog,
|
|
45
|
+
activeWorkspaceId: options.workspaceId,
|
|
46
|
+
};
|
|
47
|
+
saveWorkspaceCatalog(resolved.catalogPath, nextCatalog);
|
|
48
|
+
return resolveWorkspaceContext(options);
|
|
49
|
+
}
|
|
50
|
+
export function createWorkspaceDescriptor(options) {
|
|
51
|
+
const resolved = resolveWorkspaceContext(options);
|
|
52
|
+
const now = new Date().toISOString();
|
|
53
|
+
const anchorRoot = resolve(options.anchorRoot);
|
|
54
|
+
const repoRoots = options.repoRoots && options.repoRoots.length > 0 ?
|
|
55
|
+
options.repoRoots.map((root) => resolve(root))
|
|
56
|
+
: [anchorRoot];
|
|
57
|
+
const nextWorkspace = {
|
|
58
|
+
id: options.nextId ?? `workspace-${Date.now()}`,
|
|
59
|
+
name: options.name.trim() || deriveDefaultWorkspaceName(anchorRoot),
|
|
60
|
+
anchorRoot,
|
|
61
|
+
repoRoots,
|
|
62
|
+
stateRoot: resolve(options.stateRoot),
|
|
63
|
+
createdAt: now,
|
|
64
|
+
updatedAt: now,
|
|
65
|
+
};
|
|
66
|
+
const nextCatalog = {
|
|
67
|
+
...resolved.catalog,
|
|
68
|
+
activeWorkspaceId: options.setActive === false ? resolved.activeWorkspaceId : nextWorkspace.id,
|
|
69
|
+
workspaces: [...resolved.workspaces, nextWorkspace],
|
|
70
|
+
};
|
|
71
|
+
saveWorkspaceCatalog(resolved.catalogPath, nextCatalog);
|
|
72
|
+
return resolveWorkspaceContext(options);
|
|
73
|
+
}
|
|
74
|
+
function createDefaultWorkspaceCatalog(workspaceRoot, stateRoot) {
|
|
75
|
+
const now = new Date().toISOString();
|
|
76
|
+
return {
|
|
77
|
+
version: 1,
|
|
78
|
+
activeWorkspaceId: DEFAULT_WORKSPACE_ID,
|
|
79
|
+
workspaces: [
|
|
80
|
+
{
|
|
81
|
+
id: DEFAULT_WORKSPACE_ID,
|
|
82
|
+
name: deriveDefaultWorkspaceName(workspaceRoot),
|
|
83
|
+
anchorRoot: workspaceRoot,
|
|
84
|
+
repoRoots: [workspaceRoot],
|
|
85
|
+
stateRoot,
|
|
86
|
+
createdAt: now,
|
|
87
|
+
updatedAt: now,
|
|
88
|
+
},
|
|
89
|
+
],
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
function deriveDefaultWorkspaceName(workspaceRoot) {
|
|
93
|
+
const name = basename(workspaceRoot);
|
|
94
|
+
return name && name !== '/' ? name : 'Workspace';
|
|
95
|
+
}
|
|
96
|
+
export function readWorkspaceCatalog(catalogPath) {
|
|
97
|
+
return JSON.parse(readFileSync(catalogPath, 'utf8'));
|
|
98
|
+
}
|
|
99
|
+
export function saveWorkspaceCatalog(catalogPath, catalog) {
|
|
100
|
+
mkdirSync(dirname(catalogPath), { recursive: true });
|
|
101
|
+
writeFileSync(catalogPath, `${JSON.stringify(catalog, null, 2)}\n`, 'utf8');
|
|
102
|
+
}
|
|
103
|
+
function normalizeWorkspaceCatalog(catalog, workspaceRoot, stateRoot) {
|
|
104
|
+
const fallback = createDefaultWorkspaceCatalog(workspaceRoot, stateRoot);
|
|
105
|
+
const workspaces = Array.isArray(catalog.workspaces) && catalog.workspaces.length > 0 ?
|
|
106
|
+
catalog.workspaces.map((workspace, index) => normalizeWorkspaceDescriptor(workspace, {
|
|
107
|
+
fallbackId: index === 0 ? DEFAULT_WORKSPACE_ID : `workspace-${index + 1}`,
|
|
108
|
+
workspaceRoot,
|
|
109
|
+
stateRoot,
|
|
110
|
+
}))
|
|
111
|
+
: fallback.workspaces;
|
|
112
|
+
const activeWorkspaceId = typeof catalog.activeWorkspaceId === 'string' && workspaces.some((workspace) => workspace.id === catalog.activeWorkspaceId) ?
|
|
113
|
+
catalog.activeWorkspaceId
|
|
114
|
+
: workspaces[0]?.id ?? DEFAULT_WORKSPACE_ID;
|
|
115
|
+
return {
|
|
116
|
+
version: 1,
|
|
117
|
+
activeWorkspaceId,
|
|
118
|
+
workspaces,
|
|
119
|
+
};
|
|
120
|
+
}
|
|
121
|
+
function normalizeWorkspaceDescriptor(workspace, options) {
|
|
122
|
+
const now = new Date().toISOString();
|
|
123
|
+
const anchorRoot = resolve(workspace.anchorRoot ?? options.workspaceRoot);
|
|
124
|
+
const repoRoots = Array.isArray(workspace.repoRoots) && workspace.repoRoots.length > 0 ?
|
|
125
|
+
workspace.repoRoots.map((root) => resolve(root))
|
|
126
|
+
: [anchorRoot];
|
|
127
|
+
return {
|
|
128
|
+
id: typeof workspace.id === 'string' && workspace.id.trim() ? workspace.id : options.fallbackId,
|
|
129
|
+
name: typeof workspace.name === 'string' && workspace.name.trim() ?
|
|
130
|
+
workspace.name
|
|
131
|
+
: deriveDefaultWorkspaceName(anchorRoot),
|
|
132
|
+
anchorRoot,
|
|
133
|
+
repoRoots,
|
|
134
|
+
stateRoot: resolve(workspace.stateRoot ?? options.stateRoot),
|
|
135
|
+
createdAt: workspace.createdAt ?? now,
|
|
136
|
+
updatedAt: workspace.updatedAt ?? now,
|
|
137
|
+
};
|
|
138
|
+
}
|
|
139
|
+
//# sourceMappingURL=workspaces.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspaces.js","sourceRoot":"","sources":["../../../../src/core/runtime/workspaces.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ type ScopedEditOptions = {
|
|
|
23
23
|
rootLabel: string;
|
|
24
24
|
subjectLabel: string;
|
|
25
25
|
creationHint: string;
|
|
26
|
+
enforceRoot?: boolean;
|
|
26
27
|
};
|
|
27
28
|
export declare function isScopedEditInput(raw: unknown): raw is ScopedEditInput;
|
|
28
29
|
export declare function executeScopedEdit(raw: unknown, options: ScopedEditOptions): Promise<ToolResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-edit-core.d.ts","sourceRoot":"","sources":["../../../../src/core/tools/file-edit-core.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,UAAU,CAAC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"file-edit-core.d.ts","sourceRoot":"","sources":["../../../../src/core/tools/file-edit-core.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,gBAAgB,GAAG,cAAc,CAAC;AAEhE,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,GAAG,aAAa,GAAG,UAAU,CAAC;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB,CAAC;AAKF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,eAAe,CA4BtE;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,UAAU,CAAC,CAsBrG;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,cAAc,CAAC,GAAG,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAkCxI"}
|
|
@@ -33,6 +33,12 @@ export async function executeScopedEdit(raw, options) {
|
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
const targetPath = resolve(options.rootPath, raw.path);
|
|
36
|
+
if (options.enforceRoot && isOutsideRoot(options.rootPath, targetPath)) {
|
|
37
|
+
return {
|
|
38
|
+
ok: false,
|
|
39
|
+
error: `${options.subjectLabel} paths must stay inside ${options.rootLabel}: ${options.rootPath}. Refusing to access ${targetPath}.`,
|
|
40
|
+
};
|
|
41
|
+
}
|
|
36
42
|
if ('content' in raw) {
|
|
37
43
|
return writeScopedContent(raw, targetPath, options);
|
|
38
44
|
}
|
|
@@ -156,6 +162,10 @@ function toScopedPath(rootPath, targetPath) {
|
|
|
156
162
|
}
|
|
157
163
|
return rel;
|
|
158
164
|
}
|
|
165
|
+
function isOutsideRoot(rootPath, targetPath) {
|
|
166
|
+
const rel = relative(rootPath, targetPath);
|
|
167
|
+
return rel.startsWith('..') || isAbsolute(rel);
|
|
168
|
+
}
|
|
159
169
|
async function pathExists(path) {
|
|
160
170
|
try {
|
|
161
171
|
await access(path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-edit-core.js","sourceRoot":"","sources":["../../../../src/core/tools/file-edit-core.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"file-edit-core.js","sourceRoot":"","sources":["../../../../src/core/tools/file-edit-core.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { ToolDefinition } from '../types.js';
|
|
2
|
+
export type MemoryCheckpointToolOptions = {
|
|
3
|
+
memoryRoot?: string;
|
|
4
|
+
now?: () => Date;
|
|
5
|
+
nextId?: () => string;
|
|
6
|
+
};
|
|
7
|
+
export declare function createMemoryCheckpointTool(options?: MemoryCheckpointToolOptions): ToolDefinition;
|
|
8
|
+
//# sourceMappingURL=memory-checkpoint.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memory-checkpoint.d.ts","sourceRoot":"","sources":["../../../../src/core/tools/memory-checkpoint.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,aAAa,CAAC;AAG9D,MAAM,MAAM,2BAA2B,GAAG;IACxC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,MAAM,CAAC;CACvB,CAAC;AAiBF,wBAAgB,0BAA0B,CAAC,OAAO,GAAE,2BAAgC,GAAG,cAAc,CAyFpG"}
|
|
@@ -0,0 +1,131 @@
|
|
|
1
|
+
import { createRecordKnowledgeTool } from './record-knowledge.js';
|
|
2
|
+
const MAX_RATIONALE_LENGTH = 1000;
|
|
3
|
+
export function createMemoryCheckpointTool(options = {}) {
|
|
4
|
+
return {
|
|
5
|
+
name: 'memory_checkpoint',
|
|
6
|
+
description: 'Make the required before-final-answer memory decision for this turn. Use decision "record" when the user explicitly asks to remember something durable, states a future preference/workflow/format, or the turn discovered stable reusable workspace knowledge, recurring session patterns, or operational context that would be costly for a future agent to rediscover. Use decision "skip" for one-off task details, temporary plans, speculative guesses, duplicate facts, transient command output, or secret-like content. If decision is "record", include candidate with summary, optional evidence[], categoryHint, importance, confidence, and sourceRefs. This records a candidate for later cataloged maintenance; it does not directly edit memory notes.',
|
|
7
|
+
parameters: {
|
|
8
|
+
type: 'object',
|
|
9
|
+
additionalProperties: false,
|
|
10
|
+
properties: {
|
|
11
|
+
decision: {
|
|
12
|
+
type: 'string',
|
|
13
|
+
enum: ['record', 'skip'],
|
|
14
|
+
description: 'Whether this turn produced durable memory worth preserving',
|
|
15
|
+
},
|
|
16
|
+
rationale: {
|
|
17
|
+
type: 'string',
|
|
18
|
+
description: 'Brief reason for recording or skipping',
|
|
19
|
+
},
|
|
20
|
+
candidate: {
|
|
21
|
+
type: 'object',
|
|
22
|
+
additionalProperties: false,
|
|
23
|
+
properties: {
|
|
24
|
+
summary: {
|
|
25
|
+
type: 'string',
|
|
26
|
+
description: 'Concise durable fact or preference to preserve',
|
|
27
|
+
},
|
|
28
|
+
evidence: {
|
|
29
|
+
type: 'array',
|
|
30
|
+
items: { type: 'string' },
|
|
31
|
+
description: 'Short evidence snippets or observations supporting the summary',
|
|
32
|
+
},
|
|
33
|
+
categoryHint: {
|
|
34
|
+
type: 'string',
|
|
35
|
+
description: 'Suggested memory category, such as current-state, workflows, preferences, domain, operations, relationships, or history',
|
|
36
|
+
},
|
|
37
|
+
importance: {
|
|
38
|
+
type: 'string',
|
|
39
|
+
enum: ['low', 'medium', 'high'],
|
|
40
|
+
description: 'Expected future value of this memory candidate',
|
|
41
|
+
},
|
|
42
|
+
confidence: {
|
|
43
|
+
type: 'string',
|
|
44
|
+
enum: ['user-stated', 'tool-verified', 'inferred', 'historical'],
|
|
45
|
+
description: 'Why the candidate should be trusted',
|
|
46
|
+
},
|
|
47
|
+
sourceRefs: {
|
|
48
|
+
type: 'array',
|
|
49
|
+
items: { type: 'string' },
|
|
50
|
+
description: 'Workspace-relative file paths, commands, trace ids, or note references that support the candidate',
|
|
51
|
+
},
|
|
52
|
+
},
|
|
53
|
+
required: ['summary'],
|
|
54
|
+
},
|
|
55
|
+
},
|
|
56
|
+
required: ['decision', 'rationale'],
|
|
57
|
+
},
|
|
58
|
+
async execute(raw) {
|
|
59
|
+
const parsed = validateMemoryCheckpointInput(raw);
|
|
60
|
+
if (!parsed.ok) {
|
|
61
|
+
return { ok: false, error: parsed.error };
|
|
62
|
+
}
|
|
63
|
+
if (parsed.input.decision === 'skip') {
|
|
64
|
+
return {
|
|
65
|
+
ok: true,
|
|
66
|
+
output: {
|
|
67
|
+
decision: parsed.input.decision,
|
|
68
|
+
rationale: parsed.input.rationale,
|
|
69
|
+
message: 'Memory checkpoint skipped recording for this turn.',
|
|
70
|
+
},
|
|
71
|
+
};
|
|
72
|
+
}
|
|
73
|
+
const recordTool = createRecordKnowledgeTool(options);
|
|
74
|
+
const recordResult = await recordTool.execute(parsed.input.candidate);
|
|
75
|
+
if (!recordResult.ok) {
|
|
76
|
+
return recordResult;
|
|
77
|
+
}
|
|
78
|
+
return {
|
|
79
|
+
ok: true,
|
|
80
|
+
output: {
|
|
81
|
+
decision: parsed.input.decision,
|
|
82
|
+
rationale: parsed.input.rationale,
|
|
83
|
+
...(recordResult.output && typeof recordResult.output === 'object' && !Array.isArray(recordResult.output) ? recordResult.output : {}),
|
|
84
|
+
},
|
|
85
|
+
};
|
|
86
|
+
},
|
|
87
|
+
};
|
|
88
|
+
}
|
|
89
|
+
function validateMemoryCheckpointInput(raw) {
|
|
90
|
+
if (!raw || typeof raw !== 'object' || Array.isArray(raw)) {
|
|
91
|
+
return { ok: false, error: invalidInputMessage() };
|
|
92
|
+
}
|
|
93
|
+
const input = raw;
|
|
94
|
+
const allowedKeys = new Set(['decision', 'rationale', 'candidate']);
|
|
95
|
+
if (Object.keys(input).some((key) => !allowedKeys.has(key))) {
|
|
96
|
+
return { ok: false, error: invalidInputMessage() };
|
|
97
|
+
}
|
|
98
|
+
if (input.decision !== 'record' && input.decision !== 'skip') {
|
|
99
|
+
return { ok: false, error: invalidInputMessage() };
|
|
100
|
+
}
|
|
101
|
+
if (typeof input.rationale !== 'string' || !input.rationale.trim() || input.rationale.length > MAX_RATIONALE_LENGTH) {
|
|
102
|
+
return { ok: false, error: `Invalid input for memory_checkpoint. Required field rationale must be a non-empty string up to ${MAX_RATIONALE_LENGTH} characters.` };
|
|
103
|
+
}
|
|
104
|
+
if (input.decision === 'record') {
|
|
105
|
+
if (!input.candidate || typeof input.candidate !== 'object' || Array.isArray(input.candidate)) {
|
|
106
|
+
return { ok: false, error: 'Invalid input for memory_checkpoint. decision "record" requires candidate.' };
|
|
107
|
+
}
|
|
108
|
+
return {
|
|
109
|
+
ok: true,
|
|
110
|
+
input: {
|
|
111
|
+
decision: input.decision,
|
|
112
|
+
rationale: input.rationale.trim(),
|
|
113
|
+
candidate: input.candidate,
|
|
114
|
+
},
|
|
115
|
+
};
|
|
116
|
+
}
|
|
117
|
+
if (input.candidate !== undefined && input.candidate !== null) {
|
|
118
|
+
return { ok: false, error: 'Invalid input for memory_checkpoint. decision "skip" must not include candidate.' };
|
|
119
|
+
}
|
|
120
|
+
return {
|
|
121
|
+
ok: true,
|
|
122
|
+
input: {
|
|
123
|
+
decision: input.decision,
|
|
124
|
+
rationale: input.rationale.trim(),
|
|
125
|
+
},
|
|
126
|
+
};
|
|
127
|
+
}
|
|
128
|
+
function invalidInputMessage() {
|
|
129
|
+
return 'Invalid input for memory_checkpoint. Required fields: decision ("record"|"skip"), rationale. Include candidate only when decision is "record".';
|
|
130
|
+
}
|
|
131
|
+
//# sourceMappingURL=memory-checkpoint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"memory-checkpoint.js","sourceRoot":"","sources":["../../../../src/core/tools/memory-checkpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory-notes.d.ts","sourceRoot":"","sources":["../../../../src/core/tools/memory-notes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,aAAa,CAAC;AAG9D,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAqBF,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CAqD9F;AAED,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CAwD7F;AAED,wBAAgB,2BAA2B,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CA4ChG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"memory-notes.d.ts","sourceRoot":"","sources":["../../../../src/core/tools/memory-notes.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,cAAc,EAAc,MAAM,aAAa,CAAC;AAG9D,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAqBF,wBAAgB,yBAAyB,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CAqD9F;AAED,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CAwD7F;AAED,wBAAgB,2BAA2B,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CA4ChG;AAED,wBAAgB,wBAAwB,CAAC,OAAO,GAAE,sBAA2B,GAAG,cAAc,CA+C7F;AAED,eAAO,MAAM,mBAAmB,gBAA8B,CAAC;AAC/D,eAAO,MAAM,kBAAkB,gBAA6B,CAAC;AAC7D,eAAO,MAAM,qBAAqB,gBAAgC,CAAC;AACnE,eAAO,MAAM,kBAAkB,gBAA6B,CAAC"}
|