@dxos/assistant-toolkit 0.16.0 → 0.17.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/dist/lib/chunk-AgentOperation.mjs +5 -1
- package/dist/lib/chunk-AgentOperation.mjs.map +1 -1
- package/dist/lib/chunk-AgentOperationHandlerSet.mjs +1 -1
- package/dist/lib/chunk-AgentSkill.mjs +1 -1
- package/dist/lib/chunk-AlarmSkill.mjs +1 -1
- package/dist/lib/chunk-BrowserSkill.mjs +4 -6
- package/dist/lib/chunk-BrowserSkill.mjs.map +1 -1
- package/dist/lib/chunk-ChatContextSkill.mjs +1 -1
- package/dist/lib/chunk-DelegationSkill.mjs +2 -2
- package/dist/lib/chunk-DelegationSkill.mjs.map +1 -1
- package/dist/lib/chunk-DelegationStrategy.mjs +16 -30
- package/dist/lib/chunk-DelegationStrategy.mjs.map +1 -1
- package/dist/lib/chunk-PlanningSkill.mjs +12 -10
- package/dist/lib/chunk-PlanningSkill.mjs.map +1 -1
- package/dist/lib/chunk-SkillManagerSkill.mjs +62 -7
- package/dist/lib/chunk-SkillManagerSkill.mjs.map +1 -1
- package/dist/lib/chunk-SlashCommand.mjs +2 -2
- package/dist/lib/chunk-SlashCommand.mjs.map +1 -1
- package/dist/lib/chunk-add-mcp-connection.mjs +58 -0
- package/dist/lib/chunk-add-mcp-connection.mjs.map +1 -0
- package/dist/lib/chunk-ask-question.mjs.map +1 -1
- package/dist/lib/chunk-catalog.mjs +86 -0
- package/dist/lib/chunk-catalog.mjs.map +1 -0
- package/dist/lib/chunk-context-add.mjs +1 -1
- package/dist/lib/chunk-context-remove.mjs +1 -1
- package/dist/lib/chunk-delegate-task.mjs +2 -2
- package/dist/lib/chunk-delegate-task.mjs.map +1 -1
- package/dist/lib/chunk-delegate-tasks.mjs +2 -8
- package/dist/lib/chunk-delegate-tasks.mjs.map +1 -1
- package/dist/lib/chunk-enable-skills.mjs +1 -1
- package/dist/lib/chunk-get-context.mjs +1 -1
- package/dist/lib/chunk-get-current-date.mjs +1 -1
- package/dist/lib/chunk-mcp-connections.mjs +26 -0
- package/dist/lib/chunk-mcp-connections.mjs.map +1 -0
- package/dist/lib/chunk-operations.mjs +2 -2
- package/dist/lib/chunk-operations.mjs.map +1 -1
- package/dist/lib/chunk-operations2.mjs +144 -9
- package/dist/lib/chunk-operations2.mjs.map +1 -1
- package/dist/lib/chunk-operations3.mjs +6 -5
- package/dist/lib/chunk-operations3.mjs.map +1 -1
- package/dist/lib/chunk-operations4.mjs +30 -55
- package/dist/lib/chunk-operations4.mjs.map +1 -1
- package/dist/lib/chunk-operations5.mjs +28 -27
- package/dist/lib/chunk-operations5.mjs.map +1 -1
- package/dist/lib/chunk-operations6.mjs +64 -29
- package/dist/lib/chunk-operations6.mjs.map +1 -1
- package/dist/lib/chunk-operations7.mjs +4 -79
- package/dist/lib/chunk-operations7.mjs.map +1 -1
- package/dist/lib/chunk-plan-reminder.mjs +7 -12
- package/dist/lib/chunk-plan-reminder.mjs.map +1 -1
- package/dist/lib/chunk-query-mcp-connections.mjs +16 -0
- package/dist/lib/chunk-query-mcp-connections.mjs.map +1 -0
- package/dist/lib/chunk-query-operations.mjs +23 -0
- package/dist/lib/chunk-query-operations.mjs.map +1 -0
- package/dist/lib/chunk-query-skills.mjs +23 -3
- package/dist/lib/chunk-query-skills.mjs.map +1 -1
- package/dist/lib/chunk-query-types.mjs +24 -0
- package/dist/lib/chunk-query-types.mjs.map +1 -0
- package/dist/lib/chunk-relay.mjs +1 -1
- package/dist/lib/chunk-run-instructions.mjs +14 -10
- package/dist/lib/chunk-run-instructions.mjs.map +1 -1
- package/dist/lib/chunk-set-alarm.mjs +1 -1
- package/dist/lib/chunk-set-mcp-connection.mjs +18 -0
- package/dist/lib/chunk-set-mcp-connection.mjs.map +1 -0
- package/dist/lib/chunk-sync-automation.mjs +1 -1
- package/dist/lib/chunk-update-tasks.mjs +20 -3
- package/dist/lib/chunk-update-tasks.mjs.map +1 -1
- package/dist/lib/index.mjs +1 -3
- package/dist/lib/ns/AgentOperationHandlerSet.mjs +1 -1
- package/dist/lib/ns/AgentSkill.mjs +1 -1
- package/dist/lib/ns/AlarmSkill.mjs +1 -1
- package/dist/lib/ns/ChatContextSkill.mjs +1 -1
- package/dist/lib/ns/PlanningSkill.mjs +2 -2
- package/dist/lib/ns/SkillManagerSkill.mjs +3 -3
- package/dist/lib/testing.mjs +7 -10
- package/dist/lib/testing.mjs.map +1 -1
- package/dist/types/src/commands.d.ts +10 -0
- package/dist/types/src/commands.d.ts.map +1 -1
- package/dist/types/src/operations/run-instructions.d.ts.map +1 -1
- package/dist/types/src/skills/browser/BrowserSkill.d.ts.map +1 -1
- package/dist/types/src/skills/delegation/operations/delegate-task.d.ts +1 -1
- package/dist/types/src/skills/delegation/operations/delegate-tasks.d.ts +0 -6
- package/dist/types/src/skills/delegation/operations/delegate-tasks.d.ts.map +1 -1
- package/dist/types/src/skills/index.d.ts +0 -1
- package/dist/types/src/skills/index.d.ts.map +1 -1
- package/dist/types/src/skills/planning/PlanningSkill.d.ts +3 -0
- package/dist/types/src/skills/planning/PlanningSkill.d.ts.map +1 -1
- package/dist/types/src/skills/planning/operations/definitions.d.ts +3 -1
- package/dist/types/src/skills/planning/operations/definitions.d.ts.map +1 -1
- package/dist/types/src/skills/planning/operations/plan-reminder.d.ts +6 -5
- package/dist/types/src/skills/planning/operations/plan-reminder.d.ts.map +1 -1
- package/dist/types/src/skills/planning/operations/update-tasks.d.ts +1 -1
- package/dist/types/src/skills/planning/operations/update-tasks.d.ts.map +1 -1
- package/dist/types/src/skills/skill-manager/SkillManagerSkill.d.ts +7 -0
- package/dist/types/src/skills/skill-manager/SkillManagerSkill.d.ts.map +1 -1
- package/dist/types/src/skills/skill-manager/lookup.test.d.ts +2 -0
- package/dist/types/src/skills/skill-manager/lookup.test.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/add-mcp-connection.d.ts +19 -0
- package/dist/types/src/skills/skill-manager/operations/add-mcp-connection.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/catalog.d.ts +36 -0
- package/dist/types/src/skills/skill-manager/operations/catalog.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/definitions.d.ts +116 -1
- package/dist/types/src/skills/skill-manager/operations/definitions.d.ts.map +1 -1
- package/dist/types/src/skills/skill-manager/operations/index.d.ts.map +1 -1
- package/dist/types/src/skills/skill-manager/operations/mcp-connections.d.ts +15 -0
- package/dist/types/src/skills/skill-manager/operations/mcp-connections.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/query-mcp-connections.d.ts +11 -0
- package/dist/types/src/skills/skill-manager/operations/query-mcp-connections.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/query-operations.d.ts +17 -0
- package/dist/types/src/skills/skill-manager/operations/query-operations.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/query-skills.d.ts +20 -2
- package/dist/types/src/skills/skill-manager/operations/query-skills.d.ts.map +1 -1
- package/dist/types/src/skills/skill-manager/operations/query-types.d.ts +13 -0
- package/dist/types/src/skills/skill-manager/operations/query-types.d.ts.map +1 -0
- package/dist/types/src/skills/skill-manager/operations/set-mcp-connection.d.ts +14 -0
- package/dist/types/src/skills/skill-manager/operations/set-mcp-connection.d.ts.map +1 -0
- package/dist/types/src/supervisor/delegation-strategy.d.ts +2 -7
- package/dist/types/src/supervisor/delegation-strategy.d.ts.map +1 -1
- package/dist/types/src/testing/operations.d.ts.map +1 -1
- package/dist/types/src/types/AgentOperation.d.ts +2 -1
- package/dist/types/src/types/AgentOperation.d.ts.map +1 -1
- package/dist/types/src/types/index.d.ts +0 -1
- package/dist/types/src/types/index.d.ts.map +1 -1
- package/dist/types/tsconfig.tsbuildinfo +1 -1
- package/package.json +32 -40
- package/src/commands.test.ts +4 -0
- package/src/commands.ts +12 -2
- package/src/operations/run-instructions.test.ts +12 -6
- package/src/operations/run-instructions.ts +12 -2
- package/src/skills/browser/BrowserSkill.ts +3 -8
- package/src/skills/chat-context/operations/context-add.test.ts +6 -4
- package/src/skills/chat-context/operations/context-remove.test.ts +6 -4
- package/src/skills/delegation/DelegationSkill.ts +2 -2
- package/src/skills/delegation/operations/definitions.ts +2 -2
- package/src/skills/delegation/operations/delegate-task.test.ts +1 -2
- package/src/skills/delegation/operations/delegate-task.ts +2 -2
- package/src/skills/delegation/operations/delegate-tasks.ts +2 -8
- package/src/skills/index.ts +0 -1
- package/src/skills/planning/PlanningSkill.ts +8 -12
- package/src/skills/planning/operations/definitions.ts +5 -4
- package/src/skills/planning/operations/plan-reminder.test.ts +9 -15
- package/src/skills/planning/operations/plan-reminder.ts +7 -13
- package/src/skills/planning/operations/update-tasks.md +7 -5
- package/src/skills/planning/operations/update-tasks.model.test.ts +2 -2
- package/src/skills/planning/operations/update-tasks.test.ts +110 -10
- package/src/skills/planning/operations/update-tasks.ts +22 -10
- package/src/skills/planning/skill.test.ts +9 -7
- package/src/skills/skill-manager/SkillManagerSkill.ts +71 -5
- package/src/skills/skill-manager/lookup.test.ts +308 -0
- package/src/skills/skill-manager/operations/add-mcp-connection.ts +83 -0
- package/src/skills/skill-manager/operations/catalog.ts +140 -0
- package/src/skills/skill-manager/operations/definitions.ts +168 -6
- package/src/skills/skill-manager/operations/index.ts +14 -1
- package/src/skills/skill-manager/operations/mcp-connections.ts +29 -0
- package/src/skills/skill-manager/operations/query-mcp-connections.ts +22 -0
- package/src/skills/skill-manager/operations/query-operations.ts +50 -0
- package/src/skills/skill-manager/operations/query-skills.ts +43 -3
- package/src/skills/skill-manager/operations/query-types.ts +32 -0
- package/src/skills/skill-manager/operations/set-mcp-connection.ts +28 -0
- package/src/skills/skill-manager/skill.test.ts +172 -9
- package/src/supervisor/delegation-strategy.test.ts +55 -4
- package/src/supervisor/delegation-strategy.ts +13 -28
- package/src/testing/operations.ts +2 -6
- package/src/types/AgentOperation.ts +6 -1
- package/src/types/index.ts +0 -1
- package/dist/lib/Memory.mjs +0 -1
- package/dist/lib/chunk-Memory.mjs +0 -19
- package/dist/lib/chunk-Memory.mjs.map +0 -1
- package/dist/lib/chunk-MemorySkill.mjs +0 -39
- package/dist/lib/chunk-MemorySkill.mjs.map +0 -1
- package/dist/lib/chunk-delete.mjs +0 -14
- package/dist/lib/chunk-delete.mjs.map +0 -1
- package/dist/lib/chunk-operations8.mjs +0 -9
- package/dist/lib/chunk-operations8.mjs.map +0 -1
- package/dist/lib/chunk-query.mjs +0 -18
- package/dist/lib/chunk-query.mjs.map +0 -1
- package/dist/lib/chunk-save.mjs +0 -17
- package/dist/lib/chunk-save.mjs.map +0 -1
- package/dist/lib/ns/MemorySkill.mjs +0 -3
- package/dist/types/src/skills/memory/MemorySkill.d.ts +0 -6
- package/dist/types/src/skills/memory/MemorySkill.d.ts.map +0 -1
- package/dist/types/src/skills/memory/index.d.ts +0 -2
- package/dist/types/src/skills/memory/index.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/definitions.d.ts +0 -15
- package/dist/types/src/skills/memory/operations/definitions.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/delete.d.ts +0 -7
- package/dist/types/src/skills/memory/operations/delete.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/delete.test.d.ts +0 -2
- package/dist/types/src/skills/memory/operations/delete.test.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/index.d.ts +0 -4
- package/dist/types/src/skills/memory/operations/index.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/query.d.ts +0 -8
- package/dist/types/src/skills/memory/operations/query.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/query.test.d.ts +0 -2
- package/dist/types/src/skills/memory/operations/query.test.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/save.d.ts +0 -8
- package/dist/types/src/skills/memory/operations/save.d.ts.map +0 -1
- package/dist/types/src/skills/memory/operations/save.test.d.ts +0 -2
- package/dist/types/src/skills/memory/operations/save.test.d.ts.map +0 -1
- package/dist/types/src/skills/memory/skill.test.d.ts +0 -2
- package/dist/types/src/skills/memory/skill.test.d.ts.map +0 -1
- package/dist/types/src/types/Memory.d.ts +0 -12
- package/dist/types/src/types/Memory.d.ts.map +0 -1
- package/src/skills/memory/MemorySkill.ts +0 -39
- package/src/skills/memory/index.ts +0 -5
- package/src/skills/memory/operations/definitions.ts +0 -72
- package/src/skills/memory/operations/delete.test.ts +0 -37
- package/src/skills/memory/operations/delete.ts +0 -20
- package/src/skills/memory/operations/index.ts +0 -16
- package/src/skills/memory/operations/query.test.ts +0 -76
- package/src/skills/memory/operations/query.ts +0 -32
- package/src/skills/memory/operations/save.test.ts +0 -43
- package/src/skills/memory/operations/save.ts +0 -20
- package/src/skills/memory/skill.test.ts +0 -147
- package/src/types/Memory.ts +0 -22
|
@@ -1,84 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Harness } from "@dxos/assistant";
|
|
3
|
-
import * as Agent from "@dxos/assistant/Agent";
|
|
4
|
-
import * as Chat from "@dxos/assistant/Chat";
|
|
5
|
-
import { Database, Obj, Ref } from "@dxos/echo";
|
|
6
|
-
import { DXN as DXN$1 } from "@dxos/keys";
|
|
7
|
-
import * as Schema from "effect/Schema";
|
|
1
|
+
import { n as RunInstructions } from "./chunk-AgentOperation.mjs";
|
|
8
2
|
import * as Operation from "@dxos/compute/Operation";
|
|
9
3
|
import * as OperationHandlerSet from "@dxos/compute/OperationHandlerSet";
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
import * as TriggerEvent from "@dxos/compute/TriggerEvent";
|
|
13
|
-
//#region src/skills/agent/operations/definitions.ts
|
|
14
|
-
var definitions_exports = /* @__PURE__ */ __exportAll({
|
|
15
|
-
GetContext: () => GetContext,
|
|
16
|
-
Relay: () => Relay,
|
|
17
|
-
SyncAutomation: () => SyncAutomation
|
|
18
|
-
});
|
|
19
|
-
var Relay = Operation.make({
|
|
20
|
-
meta: {
|
|
21
|
-
key: DXN$1.make("org.dxos.operation.assistantToolkit.relay"),
|
|
22
|
-
name: "Agent Relay",
|
|
23
|
-
description: "Qualifies a subscription event with a cheap model and forwards it onto the durable agent session.",
|
|
24
|
-
icon: "ph--funnel--regular"
|
|
25
|
-
},
|
|
26
|
-
input: Schema.Struct({
|
|
27
|
-
/** The chat whose durable session receives the event (carries feed, instructions, and agent). */
|
|
28
|
-
chat: Schema.suspend(() => Ref.Ref(Chat.Chat)),
|
|
29
|
-
event: Schema.optional(TriggerEvent.TriggerEvent),
|
|
30
|
-
/** Synthetic wake prompt (e.g. a cron tick) delivered instead of an event payload. */
|
|
31
|
-
prompt: Schema.optional(Schema.String),
|
|
32
|
-
/** Skip the cheap-model relevance check (default: qualify when an event is present). */
|
|
33
|
-
qualify: Schema.optional(Schema.Boolean)
|
|
34
|
-
}),
|
|
35
|
-
output: Schema.Void,
|
|
36
|
-
services: [
|
|
37
|
-
AiService.AiService,
|
|
38
|
-
Database.Service,
|
|
39
|
-
AgentService.AgentService
|
|
40
|
-
]
|
|
41
|
-
});
|
|
42
|
-
var GetContext = Operation.make({
|
|
43
|
-
meta: {
|
|
44
|
-
key: DXN$1.make("org.dxos.operation.assistantToolkit.getContext"),
|
|
45
|
-
name: "Get Agent Context",
|
|
46
|
-
description: "Get the context of an agent.",
|
|
47
|
-
icon: "ph--info--regular"
|
|
48
|
-
},
|
|
49
|
-
input: Schema.Struct({}),
|
|
50
|
-
output: Schema.Struct({
|
|
51
|
-
id: Schema.String,
|
|
52
|
-
name: Schema.String,
|
|
53
|
-
instructions: Schema.String,
|
|
54
|
-
checklist: Schema.String
|
|
55
|
-
}),
|
|
56
|
-
services: [Harness.HarnessService, Database.Service]
|
|
57
|
-
});
|
|
58
|
-
var SyncAutomation = Operation.make({
|
|
59
|
-
meta: {
|
|
60
|
-
key: DXN$1.make("org.dxos.operation.assistantToolkit.syncTriggers"),
|
|
61
|
-
name: "Sync automation",
|
|
62
|
-
description: "Compiles the agent automation config (subscriptions, optional cron) into Routines that relay events onto the agent session. Recreates everything, so call with the FULL desired config after any change; enabled is copied from the agent onto every trigger.",
|
|
63
|
-
icon: "ph--arrows-clockwise--regular"
|
|
64
|
-
},
|
|
65
|
-
input: Schema.Struct({
|
|
66
|
-
agent: Schema.suspend(() => Ref.Ref(Agent.Agent)).annotate({ description: "The agent whose automation should be synced." }),
|
|
67
|
-
subscriptions: Schema.optional(Schema.Array(Ref.Ref(Obj.Unknown)).annotate({ description: "The objects to subscribe to (e.g. mailboxes); each compiles to a feed-triggered routine." })),
|
|
68
|
-
cron: Schema.optional(Schema.String.annotate({ description: "Cron expression for a scheduled wake routine." })),
|
|
69
|
-
qualify: Schema.optional(Schema.Boolean.annotate({ description: "Run the cheap-model relevance filter on subscription events (default true)." }))
|
|
70
|
-
}),
|
|
71
|
-
output: Schema.Void,
|
|
72
|
-
services: [Database.Service]
|
|
73
|
-
});
|
|
4
|
+
//#region src/operations/index.ts
|
|
5
|
+
var AgentHandlers = OperationHandlerSet.lazy([RunInstructions.pipe(Operation.lazyHandler(() => import("./chunk-run-instructions.mjs")))]);
|
|
74
6
|
//#endregion
|
|
75
|
-
|
|
76
|
-
var AgentSkillHandlers = OperationHandlerSet.lazy([
|
|
77
|
-
GetContext.pipe(Operation.lazyHandler(() => import("./chunk-get-context.mjs"))),
|
|
78
|
-
Relay.pipe(Operation.lazyHandler(() => import("./chunk-relay.mjs"))),
|
|
79
|
-
SyncAutomation.pipe(Operation.lazyHandler(() => import("./chunk-sync-automation.mjs")))
|
|
80
|
-
]);
|
|
81
|
-
//#endregion
|
|
82
|
-
export { definitions_exports as a, SyncAutomation as i, GetContext as n, Relay as r, AgentSkillHandlers as t };
|
|
7
|
+
export { AgentHandlers as t };
|
|
83
8
|
|
|
84
9
|
//# sourceMappingURL=chunk-operations7.mjs.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-operations7.mjs","names":[
|
|
1
|
+
{"version":3,"file":"chunk-operations7.mjs","names":[],"sources":["../../src/operations/index.ts"],"sourcesContent":["//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Operation from '@dxos/compute/Operation';\nimport * as OperationHandlerSet from '@dxos/compute/OperationHandlerSet';\n\nimport * as AgentOperation from '../types/AgentOperation.ts';\n\nexport const AgentHandlers = OperationHandlerSet.lazy([\n AgentOperation.RunInstructions.pipe(Operation.lazyHandler(() => import('./run-instructions.ts'))),\n]);\n"],"mappings":";;;;AASA,IAAa,gBAAgB,oBAAoB,KAAK,CAAA,gBACrB,KAAK,UAAU,kBAAkB,OAAO,+BAAwB,CAAC,CAClG,CAAC"}
|
|
@@ -2,7 +2,6 @@ import { r as PlanReminder } from "./chunk-operations3.mjs";
|
|
|
2
2
|
import * as Effect from "effect/Effect";
|
|
3
3
|
import { Harness } from "@dxos/assistant";
|
|
4
4
|
import * as Chat from "@dxos/assistant/Chat";
|
|
5
|
-
import { ContentBlock } from "@dxos/types";
|
|
6
5
|
import { concat, trim } from "@dxos/util";
|
|
7
6
|
import * as Operation from "@dxos/compute/Operation";
|
|
8
7
|
import { AiPreprocessor, AiService } from "@dxos/ai";
|
|
@@ -13,24 +12,20 @@ import * as Prompt from "effect/ai/Prompt";
|
|
|
13
12
|
* End-request hook for the planning skill. When the conversation's checklist still has
|
|
14
13
|
* open tasks, an ephemeral check asks the model — given the full conversation — whether the
|
|
15
14
|
* agent should keep working: a deterministic reminder alone would trap an agent that legitimately
|
|
16
|
-
* finishes with open items in an unbreakable re-prompt loop. On "continue" it
|
|
17
|
-
* continuation reminder
|
|
18
|
-
*
|
|
19
|
-
* open.
|
|
15
|
+
* finishes with open items in an unbreakable re-prompt loop. On "continue" it returns a
|
|
16
|
+
* continuation reminder as its follow-up; on "stop" it returns none so the agent may complete with
|
|
17
|
+
* items deliberately left open.
|
|
20
18
|
*/
|
|
21
19
|
var plan_reminder_default = PlanReminder.pipe(Operation.withHandler(Effect.fnUntraced(function* () {
|
|
22
20
|
const chat = yield* Harness.getChat.pipe(Effect.orElseSucceed(() => void 0));
|
|
23
|
-
if (!chat) return;
|
|
24
|
-
if (!(yield* Chat.loadTasks(chat)).some(Chat.isOpenTask)) return;
|
|
21
|
+
if (!chat) return {};
|
|
22
|
+
if (!(yield* Chat.loadTasks(chat)).some(Chat.isOpenTask)) return {};
|
|
25
23
|
const checklist = yield* Chat.formatChecklist(chat);
|
|
26
24
|
const history = yield* Harness.history;
|
|
27
25
|
const prompt = Prompt.concat(yield* AiPreprocessor.preprocessPrompt(history, { system: checklistCompletionCheckSystem }), checklistCompletionCheckPrompt(checklist));
|
|
28
26
|
const { text: reply } = yield* Effect.scoped(LanguageModel.generateText({ prompt }));
|
|
29
|
-
if (!parseContinueDecision(reply)) return;
|
|
30
|
-
|
|
31
|
-
text: checklistContinueReminderPrompt(checklist),
|
|
32
|
-
disposition: "synthetic"
|
|
33
|
-
})] });
|
|
27
|
+
if (!parseContinueDecision(reply)) return {};
|
|
28
|
+
return { followUp: checklistContinueReminderPrompt(checklist) };
|
|
34
29
|
}, Effect.provide(AiService.languageModel("com.anthropic.model.claude-sonnet-5.default")))));
|
|
35
30
|
var checklistCompletionCheckSystem = concat`
|
|
36
31
|
You decide whether an agent should stop or continue working on its checklist, given the conversation so far and the agent's remaining items.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-plan-reminder.mjs","names":[],"sources":["../../src/skills/planning/operations/plan-reminder.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as LanguageModel from 'effect/ai/LanguageModel';\nimport * as Prompt from 'effect/ai/Prompt';\nimport * as Effect from 'effect/Effect';\n\nimport { AiPreprocessor, AiService } from '@dxos/ai';\nimport { Harness } from '@dxos/assistant';\nimport * as Chat from '@dxos/assistant/Chat';\nimport * as Operation from '@dxos/compute/Operation';\nimport {
|
|
1
|
+
{"version":3,"file":"chunk-plan-reminder.mjs","names":[],"sources":["../../src/skills/planning/operations/plan-reminder.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as LanguageModel from 'effect/ai/LanguageModel';\nimport * as Prompt from 'effect/ai/Prompt';\nimport * as Effect from 'effect/Effect';\n\nimport { AiPreprocessor, AiService } from '@dxos/ai';\nimport { Harness } from '@dxos/assistant';\nimport * as Chat from '@dxos/assistant/Chat';\nimport * as Operation from '@dxos/compute/Operation';\nimport { concat, trim } from '@dxos/util';\n\nimport { PlanReminder } from './definitions.ts';\n\n/**\n * End-request hook for the planning skill. When the conversation's checklist still has\n * open tasks, an ephemeral check asks the model — given the full conversation — whether the\n * agent should keep working: a deterministic reminder alone would trap an agent that legitimately\n * finishes with open items in an unbreakable re-prompt loop. On \"continue\" it returns a\n * continuation reminder as its follow-up; on \"stop\" it returns none so the agent may complete with\n * items deliberately left open.\n */\nexport default PlanReminder.pipe(\n Operation.withHandler(\n Effect.fnUntraced(\n function* () {\n const chat = yield* Harness.getChat.pipe(Effect.orElseSucceed(() => undefined));\n if (!chat) {\n return {};\n }\n\n const tasks = yield* Chat.loadTasks(chat);\n if (!tasks.some(Chat.isOpenTask)) {\n return {};\n }\n const checklist = yield* Chat.formatChecklist(chat);\n\n const history = yield* Harness.history;\n const prompt = Prompt.concat(\n yield* AiPreprocessor.preprocessPrompt(history, { system: checklistCompletionCheckSystem }),\n checklistCompletionCheckPrompt(checklist),\n );\n const { text: reply } = yield* Effect.scoped(LanguageModel.generateText({ prompt }));\n if (!parseContinueDecision(reply)) {\n return {};\n }\n\n return { followUp: checklistContinueReminderPrompt(checklist) };\n },\n Effect.provide(AiService.languageModel('com.anthropic.model.claude-sonnet-5.default')),\n ),\n ),\n);\n\nconst checklistCompletionCheckSystem = concat`\n You decide whether an agent should stop or continue working on its checklist, given the conversation so far and the agent's remaining items.\n The user's request defines the scope: if the user asked for a specific task or subset and that work is complete, \n the agent must STOP even though other items remain open — open items alone are not a reason to continue.\n Reply with exactly one word: \"stop\" or \"continue\". Do not use tools. Do not add explanation.\n`;\n\nconst checklistCompletionCheckPrompt = (checklist: string): string => trim`\n The agent is about to finish, but its checklist still has unchecked items.\n\n <checklist>\n ${checklist}\n </checklist>\n\n Should the agent STOP now (the user's request is fulfilled, even if other items remain open)\n or CONTINUE working on the checklist (the user asked for more than has been done)?\n Reply with exactly one word: \"stop\" or \"continue\".\n`;\n\n/** Prefer an explicit \"continue\"; treat ambiguous replies as continue so open work is not dropped. */\nconst parseContinueDecision = (reply: string): boolean => {\n const normalized = reply.toLowerCase();\n if (/\\bcontinue\\b/.test(normalized)) {\n return true;\n }\n if (/\\bstop\\b/.test(normalized)) {\n return false;\n }\n return true;\n};\n\nconst checklistContinueReminderPrompt = (checklist: string): string => trim`\n Your checklist still has unchecked items; continue working before finishing.\n\n <checklist>\n ${checklist}\n </checklist>\n`;\n"],"mappings":";;;;;;;;;;;;;;;;;;AAwBA,IAAA,wBAAe,aAAa,KAC1B,UAAU,YACR,OAAO,WACL,aAAa;CACX,MAAM,OAAO,OAAO,QAAQ,QAAQ,KAAK,OAAO,oBAAoB,KAAA,CAAS,CAAC;CAC9E,IAAI,CAAC,MACH,OAAO,CAAC;CAIV,IAAI,EAAC,OADgB,KAAK,UAAU,IAAI,EAAA,CAC7B,KAAK,KAAK,UAAU,GAC7B,OAAO,CAAC;CAEV,MAAM,YAAY,OAAO,KAAK,gBAAgB,IAAI;CAElD,MAAM,UAAU,OAAO,QAAQ;CAC/B,MAAM,SAAS,OAAO,OACpB,OAAO,eAAe,iBAAiB,SAAS,EAAE,QAAQ,+BAA+B,CAAC,GAC1F,+BAA+B,SAAS,CAC1C;CACA,MAAM,EAAE,MAAM,UAAU,OAAO,OAAO,OAAO,cAAc,aAAa,EAAE,OAAO,CAAC,CAAC;CACnF,IAAI,CAAC,sBAAsB,KAAK,GAC9B,OAAO,CAAC;CAGV,OAAO,EAAE,UAAU,gCAAgC,SAAS,EAAE;AAChE,GACA,OAAO,QAAQ,UAAU,cAAc,6CAA6C,CAAC,CACvF,CACF,CACF;AAEA,IAAM,iCAAiC,MAAM;;;;;;AAO7C,IAAM,kCAAkC,cAA8B,IAAI;;;;IAItE,UAAU;;;;;;;;AASd,IAAM,yBAAyB,UAA2B;CACxD,MAAM,aAAa,MAAM,YAAY;CACrC,IAAI,eAAe,KAAK,UAAU,GAChC,OAAO;CAET,IAAI,WAAW,KAAK,UAAU,GAC5B,OAAO;CAET,OAAO;AACT;AAEA,IAAM,mCAAmC,cAA8B,IAAI;;;;IAIvE,UAAU"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { i as QueryMcpConnections } from "./chunk-operations2.mjs";
|
|
2
|
+
import { n as mcpConnections, t as describe } from "./chunk-mcp-connections.mjs";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import { Harness } from "@dxos/assistant";
|
|
5
|
+
import * as Operation from "@dxos/compute/Operation";
|
|
6
|
+
//#region src/skills/skill-manager/operations/query-mcp-connections.ts
|
|
7
|
+
var query_mcp_connections_default = QueryMcpConnections.pipe(Operation.withHandler(Effect.fnUntraced(function* () {
|
|
8
|
+
const binder = yield* Harness.binder.pipe(Effect.orDie);
|
|
9
|
+
yield* Effect.promise(() => binder.sync());
|
|
10
|
+
const states = binder.getConnections();
|
|
11
|
+
return (yield* mcpConnections).map((connection) => describe(connection, states));
|
|
12
|
+
})));
|
|
13
|
+
//#endregion
|
|
14
|
+
export { query_mcp_connections_default as default };
|
|
15
|
+
|
|
16
|
+
//# sourceMappingURL=chunk-query-mcp-connections.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chunk-query-mcp-connections.mjs","names":[],"sources":["../../src/skills/skill-manager/operations/query-mcp-connections.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { Harness } from '@dxos/assistant';\nimport * as Operation from '@dxos/compute/Operation';\n\nimport { QueryMcpConnections } from './definitions.ts';\nimport { describe, mcpConnections } from './mcp-connections.ts';\n\nexport default QueryMcpConnections.pipe(\n Operation.withHandler(\n Effect.fnUntraced(function* () {\n const binder = yield* Harness.binder.pipe(Effect.orDie);\n yield* Effect.promise(() => binder.sync());\n const states = binder.getConnections();\n return (yield* mcpConnections).map((connection) => describe(connection, states));\n }),\n ),\n);\n"],"mappings":";;;;;;AAYA,IAAA,gCAAe,oBAAoB,KACjC,UAAU,YACR,OAAO,WAAW,aAAa;CAC7B,MAAM,SAAS,OAAO,QAAQ,OAAO,KAAK,OAAO,KAAK;CACtD,OAAO,OAAO,cAAc,OAAO,KAAK,CAAC;CACzC,MAAM,SAAS,OAAO,eAAe;CACrC,QAAQ,OAAO,eAAA,CAAgB,KAAK,eAAe,SAAS,YAAY,MAAM,CAAC;AACjF,CAAC,CACH,CACF"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { a as QueryOperations } from "./chunk-operations2.mjs";
|
|
2
|
+
import { c as sameKey, i as knownSkills, l as skillKey, n as enabledSkills, o as operationCandidates, r as isEnabled, s as ranked, t as brief, u as withInput } from "./chunk-catalog.mjs";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import { Filter, Registry } from "@dxos/echo";
|
|
5
|
+
import * as Skill from "@dxos/compute/Skill";
|
|
6
|
+
import * as Operation from "@dxos/compute/Operation";
|
|
7
|
+
//#region src/skills/skill-manager/operations/query-operations.ts
|
|
8
|
+
var query_operations_default = QueryOperations.pipe(Operation.withHandler(Effect.fnUntraced(function* ({ query, skill, keys } = {}) {
|
|
9
|
+
const enabled = yield* enabledSkills;
|
|
10
|
+
const skills = knownSkills(yield* Registry.runQuery(Filter.type(Skill.Skill)), enabled).filter((candidate) => (isEnabled(enabled, candidate) || candidate.agentCanEnable === true) && (skill === void 0 || sameKey(skill, skillKey(candidate))));
|
|
11
|
+
const candidates = operationCandidates(skills, enabled, yield* Registry.runQuery(Filter.type(Operation.PersistentOperation)));
|
|
12
|
+
if (keys !== void 0) return yield* Effect.forEach(candidates.filter(({ listed }) => keys.some((key) => sameKey(key, listed.key) || key === listed.tool)), withInput);
|
|
13
|
+
return ranked(candidates, query, ({ listed }) => [
|
|
14
|
+
listed.key,
|
|
15
|
+
listed.name,
|
|
16
|
+
listed.description,
|
|
17
|
+
listed.skill
|
|
18
|
+
]).map(({ listed }) => brief(listed));
|
|
19
|
+
})));
|
|
20
|
+
//#endregion
|
|
21
|
+
export { query_operations_default as default };
|
|
22
|
+
|
|
23
|
+
//# sourceMappingURL=chunk-query-operations.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chunk-query-operations.mjs","names":[],"sources":["../../src/skills/skill-manager/operations/query-operations.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport * as Operation from '@dxos/compute/Operation';\nimport * as Skill from '@dxos/compute/Skill';\nimport { Filter, Registry } from '@dxos/echo';\n\nimport {\n brief,\n enabledSkills,\n isEnabled,\n knownSkills,\n operationCandidates,\n ranked,\n sameKey,\n skillKey,\n withInput,\n} from './catalog.ts';\nimport { QueryOperations } from './definitions.ts';\n\nexport default QueryOperations.pipe(\n Operation.withHandler(\n Effect.fnUntraced(function* ({ query, skill, keys } = {}) {\n const enabled = yield* enabledSkills;\n // The skills the agent can use: enabled here, or ones it may enable.\n const skills = knownSkills(yield* Registry.runQuery(Filter.type(Skill.Skill)), enabled).filter(\n (candidate) =>\n (isEnabled(enabled, candidate) || candidate.agentCanEnable === true) &&\n (skill === undefined || sameKey(skill, skillKey(candidate))),\n );\n const candidates = operationCandidates(\n skills,\n enabled,\n yield* Registry.runQuery(Filter.type(Operation.PersistentOperation)),\n );\n if (keys !== undefined) {\n return yield* Effect.forEach(\n candidates.filter(({ listed }) => keys.some((key) => sameKey(key, listed.key) || key === listed.tool)),\n withInput,\n );\n }\n return ranked(candidates, query, ({ listed }) => [listed.key, listed.name, listed.description, listed.skill]).map(\n ({ listed }) => brief(listed),\n );\n }),\n ),\n);\n"],"mappings":";;;;;;;AAuBA,IAAA,2BAAe,gBAAgB,KAC7B,UAAU,YACR,OAAO,WAAW,WAAW,EAAE,OAAO,OAAO,SAAS,CAAC,GAAG;CACxD,MAAM,UAAU,OAAO;CAEvB,MAAM,SAAS,YAAY,OAAO,SAAS,SAAS,OAAO,KAAK,MAAM,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,QACrF,eACE,UAAU,SAAS,SAAS,KAAK,UAAU,mBAAmB,UAC9D,UAAU,KAAA,KAAa,QAAQ,OAAO,SAAS,SAAS,CAAC,EAC9D;CACA,MAAM,aAAa,oBACjB,QACA,SACA,OAAO,SAAS,SAAS,OAAO,KAAK,UAAU,mBAAmB,CAAC,CACrE;CACA,IAAI,SAAS,KAAA,GACX,OAAO,OAAO,OAAO,QACnB,WAAW,QAAQ,EAAE,aAAa,KAAK,MAAM,QAAQ,QAAQ,KAAK,OAAO,GAAG,KAAK,QAAQ,OAAO,IAAI,CAAC,GACrG,SACF;CAEF,OAAO,OAAO,YAAY,QAAQ,EAAE,aAAa;EAAC,OAAO;EAAK,OAAO;EAAM,OAAO;EAAa,OAAO;CAAK,CAAC,CAAC,CAAC,KAC3G,EAAE,aAAa,MAAM,MAAM,CAC9B;AACF,CAAC,CACH,CACF"}
|
|
@@ -1,11 +1,31 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { o as QuerySkills } from "./chunk-operations2.mjs";
|
|
2
|
+
import { a as listedSkill, c as sameKey, i as knownSkills, l as skillKey, n as enabledSkills, o as operationCandidates, r as isEnabled, s as ranked, t as brief } from "./chunk-catalog.mjs";
|
|
3
|
+
import * as Cause from "effect/Cause";
|
|
2
4
|
import * as Effect from "effect/Effect";
|
|
3
5
|
import { Filter, Registry } from "@dxos/echo";
|
|
4
6
|
import * as Skill from "@dxos/compute/Skill";
|
|
7
|
+
import * as Template from "@dxos/compute/Template";
|
|
5
8
|
import * as Operation from "@dxos/compute/Operation";
|
|
9
|
+
import * as Option from "effect/Option";
|
|
6
10
|
//#region src/skills/skill-manager/operations/query-skills.ts
|
|
7
|
-
var query_skills_default = QuerySkills.pipe(Operation.withHandler(Effect.fnUntraced(function* () {
|
|
8
|
-
|
|
11
|
+
var query_skills_default = QuerySkills.pipe(Operation.withHandler(Effect.fnUntraced(function* ({ query, keys } = {}) {
|
|
12
|
+
const enabled = yield* enabledSkills;
|
|
13
|
+
const skills = knownSkills(yield* Registry.runQuery(Filter.type(Skill.Skill)), enabled);
|
|
14
|
+
if (keys === void 0) return ranked(skills, query, (skill) => [
|
|
15
|
+
skillKey(skill),
|
|
16
|
+
skill.name,
|
|
17
|
+
skill.description,
|
|
18
|
+
...skill.tools
|
|
19
|
+
]).map((skill) => listedSkill(skill, isEnabled(enabled, skill)));
|
|
20
|
+
const records = yield* Registry.runQuery(Filter.type(Operation.PersistentOperation));
|
|
21
|
+
return yield* Effect.forEach(skills.filter((skill) => keys.some((key) => sameKey(key, skillKey(skill)))), Effect.fnUntraced(function* (skill) {
|
|
22
|
+
const instructions = yield* Template.processTemplate(skill.instructions).pipe(Effect.map(Option.some), Effect.catchCause((cause) => Cause.hasInterrupts(cause) ? Effect.interrupt : Effect.succeed(Option.none())));
|
|
23
|
+
return {
|
|
24
|
+
...listedSkill(skill, isEnabled(enabled, skill)),
|
|
25
|
+
...Option.isSome(instructions) ? { instructions: instructions.value } : {},
|
|
26
|
+
operations: operationCandidates([skill], enabled, records).map(({ listed }) => brief(listed))
|
|
27
|
+
};
|
|
28
|
+
}));
|
|
9
29
|
})));
|
|
10
30
|
//#endregion
|
|
11
31
|
export { query_skills_default as default };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-query-skills.mjs","names":[],"sources":["../../src/skills/skill-manager/operations/query-skills.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport * as Operation from '@dxos/compute/Operation';\nimport * as Skill from '@dxos/compute/Skill';\nimport { Filter, Registry } from '@dxos/echo';\n\nimport { QuerySkills } from './definitions.ts';\n\nexport default QuerySkills.pipe(\n Operation.withHandler(\n Effect.fnUntraced(function* () {\n const skills = yield* Registry.runQuery(Filter.type(Skill.Skill));\n return skills.
|
|
1
|
+
{"version":3,"file":"chunk-query-skills.mjs","names":[],"sources":["../../src/skills/skill-manager/operations/query-skills.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Cause from 'effect/Cause';\nimport * as Effect from 'effect/Effect';\nimport * as Option from 'effect/Option';\n\nimport * as Operation from '@dxos/compute/Operation';\nimport * as Skill from '@dxos/compute/Skill';\nimport * as Template from '@dxos/compute/Template';\nimport { Filter, Registry } from '@dxos/echo';\n\nimport {\n brief,\n enabledSkills,\n isEnabled,\n knownSkills,\n listedSkill,\n operationCandidates,\n ranked,\n sameKey,\n skillKey,\n} from './catalog.ts';\nimport { QuerySkills } from './definitions.ts';\n\nexport default QuerySkills.pipe(\n Operation.withHandler(\n // The skill's own prompt template invokes this with no input at all.\n Effect.fnUntraced(function* ({ query, keys } = {}) {\n const enabled = yield* enabledSkills;\n const skills = knownSkills(yield* Registry.runQuery(Filter.type(Skill.Skill)), enabled);\n if (keys === undefined) {\n // Tool names count: a model that lacks an operation knows what it wants to do, not which skill carries it.\n return ranked(skills, query, (skill) => [skillKey(skill), skill.name, skill.description, ...skill.tools]).map(\n (skill) => listedSkill(skill, isEnabled(enabled, skill)),\n );\n }\n const records = yield* Registry.runQuery(Filter.type(Operation.PersistentOperation));\n return yield* Effect.forEach(\n skills.filter((skill) => keys.some((key) => sameKey(key, skillKey(skill)))),\n Effect.fnUntraced(function* (skill) {\n // A template that fails to render, by an error or a defect, costs the skill its instructions rather than the\n // whole lookup; an interruption still interrupts.\n const instructions = yield* Template.processTemplate(skill.instructions).pipe(\n Effect.map(Option.some),\n Effect.catchCause((cause) =>\n Cause.hasInterrupts(cause) ? Effect.interrupt : Effect.succeed(Option.none<string>()),\n ),\n );\n return {\n ...listedSkill(skill, isEnabled(enabled, skill)),\n ...(Option.isSome(instructions) ? { instructions: instructions.value } : {}),\n operations: operationCandidates([skill], enabled, records).map(({ listed }) => brief(listed)),\n };\n }),\n );\n }),\n ),\n);\n"],"mappings":";;;;;;;;;;AA0BA,IAAA,uBAAe,YAAY,KACzB,UAAU,YAER,OAAO,WAAW,WAAW,EAAE,OAAO,SAAS,CAAC,GAAG;CACjD,MAAM,UAAU,OAAO;CACvB,MAAM,SAAS,YAAY,OAAO,SAAS,SAAS,OAAO,KAAK,MAAM,KAAK,CAAC,GAAG,OAAO;CACtF,IAAI,SAAS,KAAA,GAEX,OAAO,OAAO,QAAQ,QAAQ,UAAU;EAAC,SAAS,KAAK;EAAG,MAAM;EAAM,MAAM;EAAa,GAAG,MAAM;CAAK,CAAC,CAAC,CAAC,KACvG,UAAU,YAAY,OAAO,UAAU,SAAS,KAAK,CAAC,CACzD;CAEF,MAAM,UAAU,OAAO,SAAS,SAAS,OAAO,KAAK,UAAU,mBAAmB,CAAC;CACnF,OAAO,OAAO,OAAO,QACnB,OAAO,QAAQ,UAAU,KAAK,MAAM,QAAQ,QAAQ,KAAK,SAAS,KAAK,CAAC,CAAC,CAAC,GAC1E,OAAO,WAAW,WAAW,OAAO;EAGlC,MAAM,eAAe,OAAO,SAAS,gBAAgB,MAAM,YAAY,CAAC,CAAC,KACvE,OAAO,IAAI,OAAO,IAAI,GACtB,OAAO,YAAY,UACjB,MAAM,cAAc,KAAK,IAAI,OAAO,YAAY,OAAO,QAAQ,OAAO,KAAa,CAAC,CACtF,CACF;EACA,OAAO;GACL,GAAG,YAAY,OAAO,UAAU,SAAS,KAAK,CAAC;GAC/C,GAAI,OAAO,OAAO,YAAY,IAAI,EAAE,cAAc,aAAa,MAAM,IAAI,CAAC;GAC1E,YAAY,oBAAoB,CAAC,KAAK,GAAG,SAAS,OAAO,CAAC,CAAC,KAAK,EAAE,aAAa,MAAM,MAAM,CAAC;EAC9F;CACF,CAAC,CACH;AACF,CAAC,CACH,CACF"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { s as QueryTypes } from "./chunk-operations2.mjs";
|
|
2
|
+
import { s as ranked } from "./chunk-catalog.mjs";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import { Database } from "@dxos/echo";
|
|
5
|
+
import * as Operation from "@dxos/compute/Operation";
|
|
6
|
+
import { describeTypes, renderFields } from "@dxos/assistant/Describe";
|
|
7
|
+
//#region src/skills/skill-manager/operations/query-types.ts
|
|
8
|
+
var listedType = ({ typename, dxn, kind }) => ({
|
|
9
|
+
typename,
|
|
10
|
+
dxn,
|
|
11
|
+
kind
|
|
12
|
+
});
|
|
13
|
+
var query_types_default = QueryTypes.pipe(Operation.withHandler(Effect.fnUntraced(function* ({ query, typenames } = {}) {
|
|
14
|
+
const { db } = yield* Database.Service;
|
|
15
|
+
if (typenames !== void 0) return describeTypes(db, { abridge: false }).filter(({ typename, dxn }) => typenames.includes(typename) || typenames.includes(dxn)).map((type) => ({
|
|
16
|
+
...listedType(type),
|
|
17
|
+
fields: renderFields(type.fields)
|
|
18
|
+
}));
|
|
19
|
+
return ranked(describeTypes(db), query, ({ typename, fields }) => [typename, ...fields.map(({ name }) => name)]).map(listedType);
|
|
20
|
+
})));
|
|
21
|
+
//#endregion
|
|
22
|
+
export { query_types_default as default };
|
|
23
|
+
|
|
24
|
+
//# sourceMappingURL=chunk-query-types.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chunk-query-types.mjs","names":[],"sources":["../../src/skills/skill-manager/operations/query-types.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { type TypeDescription, describeTypes, renderFields } from '@dxos/assistant/Describe';\nimport * as Operation from '@dxos/compute/Operation';\nimport { Database } from '@dxos/echo';\n\nimport { ranked } from './catalog.ts';\nimport { QueryTypes } from './definitions.ts';\n\nconst listedType = ({ typename, dxn, kind }: TypeDescription) => ({ typename, dxn, kind });\n\nexport default QueryTypes.pipe(\n Operation.withHandler(\n Effect.fnUntraced(function* ({ query, typenames } = {}) {\n const { db } = yield* Database.Service;\n if (typenames !== undefined) {\n // A lookup spells out every variant of a union, since this is how a model finds the fields it must write.\n return describeTypes(db, { abridge: false })\n .filter(({ typename, dxn }) => typenames.includes(typename) || typenames.includes(dxn))\n .map((type) => ({ ...listedType(type), fields: renderFields(type.fields) }));\n }\n return ranked(describeTypes(db), query, ({ typename, fields }) => [\n typename,\n ...fields.map(({ name }) => name),\n ]).map(listedType);\n }),\n ),\n);\n"],"mappings":";;;;;;;AAaA,IAAM,cAAc,EAAE,UAAU,KAAK,YAA6B;CAAE;CAAU;CAAK;AAAK;AAExF,IAAA,sBAAe,WAAW,KACxB,UAAU,YACR,OAAO,WAAW,WAAW,EAAE,OAAO,cAAc,CAAC,GAAG;CACtD,MAAM,EAAE,OAAO,OAAO,SAAS;CAC/B,IAAI,cAAc,KAAA,GAEhB,OAAO,cAAc,IAAI,EAAE,SAAS,MAAM,CAAC,CAAC,CACzC,QAAQ,EAAE,UAAU,UAAU,UAAU,SAAS,QAAQ,KAAK,UAAU,SAAS,GAAG,CAAC,CAAC,CACtF,KAAK,UAAU;EAAE,GAAG,WAAW,IAAI;EAAG,QAAQ,aAAa,KAAK,MAAM;CAAE,EAAE;CAE/E,OAAO,OAAO,cAAc,EAAE,GAAG,QAAQ,EAAE,UAAU,aAAa,CAChE,UACA,GAAG,OAAO,KAAK,EAAE,WAAW,IAAI,CAClC,CAAC,CAAC,CAAC,IAAI,UAAU;AACnB,CAAC,CACH,CACF"}
|
package/dist/lib/chunk-relay.mjs
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { t as PromptError } from "./chunk-errors.mjs";
|
|
2
2
|
import { n as RunInstructions } from "./chunk-AgentOperation.mjs";
|
|
3
3
|
import * as Effect from "effect/Effect";
|
|
4
|
-
import { AiSession, getOperationFromTool, makeToolExecutionService, makeToolResolverFromOperations } from "@dxos/assistant";
|
|
4
|
+
import { AiSession, TrajectoryStore, getOperationFromTool, makeToolExecutionService, makeToolResolverFromOperations } from "@dxos/assistant";
|
|
5
5
|
import * as Chat from "@dxos/assistant/Chat";
|
|
6
|
-
import { Database,
|
|
6
|
+
import { Database, JsonSchema, Obj, Ref } from "@dxos/echo";
|
|
7
7
|
import * as EffectEx from "@dxos/effect/EffectEx";
|
|
8
8
|
import { DXN as DXN$1 } from "@dxos/keys";
|
|
9
9
|
import { log } from "@dxos/log";
|
|
@@ -17,6 +17,7 @@ import * as Toolkit from "effect/ai/Toolkit";
|
|
|
17
17
|
import * as Layer from "effect/Layer";
|
|
18
18
|
import * as Deferred from "effect/Deferred";
|
|
19
19
|
import * as Option from "effect/Option";
|
|
20
|
+
import { loadMcpServers } from "@dxos/agent-runtime";
|
|
20
21
|
import { invariant } from "@dxos/invariant";
|
|
21
22
|
import * as Tool from "effect/ai/Tool";
|
|
22
23
|
//#region src/operations/complete-job-tool.ts
|
|
@@ -73,7 +74,7 @@ var run_instructions_default = RunInstructions.pipe(Operation.withHandler(Effect
|
|
|
73
74
|
log.info("processing input", { input: data.input }, {
|
|
74
75
|
"~LogMeta": "~LogMeta",
|
|
75
76
|
F: __dxlog_file,
|
|
76
|
-
L:
|
|
77
|
+
L: 43,
|
|
77
78
|
S: this
|
|
78
79
|
});
|
|
79
80
|
const input = yield* Ref.isRef(data.input) ? Database.load(data.input).pipe(Effect.map(Obj.toJSON)) : Effect.succeed(data.input);
|
|
@@ -86,7 +87,7 @@ var run_instructions_default = RunInstructions.pipe(Operation.withHandler(Effect
|
|
|
86
87
|
}, {
|
|
87
88
|
"~LogMeta": "~LogMeta",
|
|
88
89
|
F: __dxlog_file,
|
|
89
|
-
L:
|
|
90
|
+
L: 53,
|
|
90
91
|
S: this
|
|
91
92
|
});
|
|
92
93
|
const skillRefs = yield* Effect.filter(instructions.skills, (ref) => Database.load(ref).pipe(Effect.as(true), Effect.catchTag("EntityNotFoundError", () => Effect.succeed(false))));
|
|
@@ -116,12 +117,12 @@ var run_instructions_default = RunInstructions.pipe(Operation.withHandler(Effect
|
|
|
116
117
|
invariant(Obj.instanceOf(Chat.Chat, chat), "Expected Chat object.", {
|
|
117
118
|
"~LogMeta": "~LogMeta",
|
|
118
119
|
F: __dxlog_file,
|
|
119
|
-
L:
|
|
120
|
+
L: 104,
|
|
120
121
|
S: this,
|
|
121
122
|
A: ["Obj.instanceOf(Chat.Chat, chat)", "'Expected Chat object.'"]
|
|
122
123
|
});
|
|
123
124
|
feed = yield* Database.load(chat.feed);
|
|
124
|
-
} else feed = yield* Database.add(
|
|
125
|
+
} else feed = yield* Database.add(TrajectoryStore.makeFeed());
|
|
125
126
|
const resultSink = yield* Deferred.make();
|
|
126
127
|
const promptToolkit = makePromptAgentToolkit({
|
|
127
128
|
completeJobTool: makeCompleteJobTool(instructions.output),
|
|
@@ -137,16 +138,19 @@ var run_instructions_default = RunInstructions.pipe(Operation.withHandler(Effect
|
|
|
137
138
|
skills: skillRefs,
|
|
138
139
|
objects: data.chat ? [...objectRefs, data.chat] : objectRefs
|
|
139
140
|
}));
|
|
141
|
+
const mcpServers = loadMcpServers({ feed }).pipe(Effect.provide(yield* Effect.context()));
|
|
140
142
|
yield* session.createRequest({
|
|
141
143
|
prompt: promptText,
|
|
142
144
|
system: systemText,
|
|
143
|
-
toolkit: promptToolkit
|
|
145
|
+
toolkit: promptToolkit,
|
|
146
|
+
mcpServers
|
|
144
147
|
}).pipe(Effect.provide(Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations())));
|
|
145
148
|
return yield* Deferred.poll(resultSink).pipe(Effect.flatMap(Effect.fromOption), Effect.flatten, Effect.catchTag("NoSuchElementError", () => Effect.gen(function* () {
|
|
146
149
|
yield* session.createRequest({
|
|
147
150
|
prompt: "You must signal task completion by calling [completeJob] with the output or failure reason.",
|
|
148
151
|
system: systemText,
|
|
149
|
-
toolkit: promptToolkit
|
|
152
|
+
toolkit: promptToolkit,
|
|
153
|
+
mcpServers
|
|
150
154
|
}).pipe(Effect.provide(Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations())));
|
|
151
155
|
return yield* Deferred.poll(resultSink).pipe(Effect.flatMap(Effect.fromOption), Effect.flatten, Effect.catchTag("NoSuchElementError", () => Effect.fail(new PromptError("Agent did not signal task completion.", {}))));
|
|
152
156
|
})));
|
|
@@ -170,14 +174,14 @@ var ToolExecutionService = ({ feed }) => Layer.unwrap(Effect.gen(function* () {
|
|
|
170
174
|
}, {
|
|
171
175
|
"~LogMeta": "~LogMeta",
|
|
172
176
|
F: __dxlog_file,
|
|
173
|
-
L:
|
|
177
|
+
L: 225,
|
|
174
178
|
S: this
|
|
175
179
|
});
|
|
176
180
|
const result = yield* operationInvoker.invoke(operationDef, input, { conversation: Obj.getURI(feed) }).pipe(Effect.orDie);
|
|
177
181
|
log("result", { result }, {
|
|
178
182
|
"~LogMeta": "~LogMeta",
|
|
179
183
|
F: __dxlog_file,
|
|
180
|
-
L:
|
|
184
|
+
L: 231,
|
|
181
185
|
S: this
|
|
182
186
|
});
|
|
183
187
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chunk-run-instructions.mjs","names":["DXN"],"sources":["../../src/operations/complete-job-tool.ts","../../src/operations/run-instructions.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Tool from 'effect/ai/Tool';\nimport * as Schema from 'effect/Schema';\n\nimport { JsonSchema } from '@dxos/echo';\n\n/** `Instructions.make` defaults `output` to `Schema.Void`; this is what that serializes to. */\nconst UNDECLARED_OUTPUT = JsonSchema.toJsonSchema(Schema.Void);\nconst UNDECLARED_TYPE = 'type' in UNDECLARED_OUTPUT ? UNDECLARED_OUTPUT.type : undefined;\n\n/**\n * Whether the routine's stored output carries a payload contract. `Instructions` keeps only the\n * serialized schema, so a declared `null` output is indistinguishable from a defaulted one — and\n * wants the same tool either way, having no payload to validate.\n */\nconst isUndeclaredOutput = (output: JsonSchema.JsonSchema): boolean =>\n ('$id' in output && output.$id === '/schemas/unknown') || ('type' in output && output.type === UNDECLARED_TYPE);\n\n/**\n * Accepts any JSON value, unlike `Schema.Any`, while serializing to concrete types. This matters\n * twice: the Anthropic API rejects a strict tool whose schema contains the empty `{}` subschema\n * `Schema.Any` serializes to, and — observed live — a schema-less `success` invites the model to\n * emit invalid JSON (digit-separated numbers such as `3,628,800`), which kills the sub-agent.\n * `ObjectKeyword` rather than `Record(String, Any)`: the provider's structured-output codec\n * rewrites records into [key, value] tuples whose value member is again the empty schema.\n */\nconst JsonPayload = Schema.Union([\n Schema.String,\n Schema.Number,\n Schema.Boolean,\n Schema.ObjectKeyword,\n Schema.Array(Schema.Any),\n]);\n\n/** The parameters `completeJob` decodes: the declared output (or any JSON payload) under `success`. */\nexport const makeCompleteJobParameters = (output: JsonSchema.JsonSchema) =>\n Schema.Struct({\n // Both fields accept `null` because models emit it for a field they mean to omit.\n success: Schema.optional(\n Schema.NullOr(isUndeclaredOutput(output) ? JsonPayload : JsonSchema.toEffectSchema(output)),\n ),\n failure: Schema.optional(\n Schema.NullOr(\n Schema.Struct({\n message: Schema.String.annotate({\n description: 'Short message describing the error.',\n }),\n description: Schema.optional(Schema.NullOr(Schema.String)).annotate({\n description: 'Optional longer message describing in detail what went wrong',\n }),\n }),\n ),\n ),\n });\n\n/**\n * The tool a routine signals completion with: its declared output under `success`, or a failure.\n *\n * Dynamic rather than static: a dynamic tool's JSON schema reaches the provider verbatim, while a\n * static tool is serialized through the provider's structured-output transformer, which rewrites\n * object members into typeless subschemas the Anthropic API rejects. The caller decodes the\n * (unvalidated) input against {@link makeCompleteJobParameters}, so what the model is told and\n * what is validated agree.\n */\nexport const makeCompleteJobTool = (output: JsonSchema.JsonSchema) =>\n Tool.dynamic('completeJob', {\n parameters: JsonSchema.toJsonSchema(makeCompleteJobParameters(output)),\n failure: Schema.String,\n }).annotate(Tool.Strict, false);\n","//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Toolkit from 'effect/ai/Toolkit';\nimport * as Deferred from 'effect/Deferred';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\nimport * as Option from 'effect/Option';\nimport * as Schema from 'effect/Schema';\n\nimport { AiService, OpaqueToolkit } from '@dxos/ai';\nimport {\n AiSession,\n getOperationFromTool,\n makeToolExecutionService,\n makeToolResolverFromOperations,\n} from '@dxos/assistant';\nimport * as Chat from '@dxos/assistant/Chat';\nimport * as Operation from '@dxos/compute/Operation';\nimport * as Template from '@dxos/compute/Template';\nimport * as Trace from '@dxos/compute/Trace';\nimport { Database, Feed, Obj, Ref } from '@dxos/echo';\nimport * as EffectEx from '@dxos/effect/EffectEx';\nimport { invariant } from '@dxos/invariant';\nimport { DXN } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { trim } from '@dxos/util';\n\nimport { PromptError } from '../errors.ts';\nimport * as AgentOperation from '../types/AgentOperation.ts';\nimport { makeCompleteJobParameters, makeCompleteJobTool } from './complete-job-tool.ts';\n\nconst DEFAULT_MODEL: DXN.DXN = DXN.make('com.anthropic.model.claude-opus-5.default');\n\nexport default AgentOperation.RunInstructions.pipe(\n Operation.withHandler(\n Effect.fnUntraced(\n function* (data) {\n log.info('processing input', { input: data.input });\n\n const input = yield* Ref.isRef(data.input)\n ? Database.load(data.input).pipe(Effect.map(Obj.toJSON))\n : Effect.succeed(data.input);\n\n yield* Database.flush();\n const instructions = yield* Database.load(data.instructions);\n yield* Trace.emitStatus(`Running ${instructions.id}`);\n\n log.info('starting agent', { instructions: instructions.id, input });\n\n // Bind the instructions' own refs, dropping any that no longer resolve. The refs must be\n // bound as-is (not re-wrapped via `Ref.make`) to preserve their registry DXN: bindings\n // are persisted to the conversation feed, and registry-only skills have no space-DB\n // identity, so an EID ref would not resolve when the binding is re-read.\n const skillRefs = yield* Effect.filter(instructions.skills, (ref) =>\n Database.load(ref).pipe(\n Effect.as(true),\n Effect.catchTag('EntityNotFoundError', () => Effect.succeed(false)),\n ),\n );\n\n // Bind the instructions' context objects (sibling of skills), dropping any that no longer resolve.\n const objectRefs = yield* Effect.filter(instructions.objects ?? [], (ref) =>\n Database.load(ref).pipe(\n Effect.as(true),\n Effect.catchTag('EntityNotFoundError', () => Effect.succeed(false)),\n ),\n );\n\n const textDoc = yield* Database.load(instructions.text);\n let promptText = Template.process(textDoc.content, input);\n\n if (input !== undefined) {\n promptText += `\\n<input>${JSON.stringify(input)}</input>`;\n }\n\n let systemText = trim`\n You are an agent running in the non-interactive mode.\n The user is unable to see what you are doing, and cannot answer any questions.\n Do not ask questions.\n Complete the task before you, and at the end call [completeJob] with {\"success\": <output>}.\n The output goes inside \"success\" — never at the top level, and never wrapped in a second\n \"success\" of its own.\n If you are unable to complete the task, call [completeJob] with {\"failure\": {\"message\": \"...\"}}.\n Pass one of the two, never both, and omit the field you do not use.\n If no output is required, call [completeJob] with an empty object: {}\n The success value must be strictly valid JSON: quote free text, and write numbers without\n digit separators (3628800, never 3,628,800).\n Do not stop until you call [completeJob].\n `;\n if (data.systemInstructions) {\n systemText += `\\n${data.systemInstructions}`;\n }\n\n const modelLayer = AiService.languageModel(DXN.getName(data.model ?? DEFAULT_MODEL));\n\n let feed: Feed.Feed;\n if (data.chat) {\n const chat = yield* Database.load(data.chat);\n invariant(Obj.instanceOf(Chat.Chat, chat), 'Expected Chat object.');\n feed = yield* Database.load(chat.feed);\n } else {\n feed = yield* Database.add(Feed.make());\n }\n\n const resultSink = yield* Deferred.make<unknown, PromptError>();\n const promptToolkit = makePromptAgentToolkit({\n completeJobTool: makeCompleteJobTool(instructions.output),\n parameters: makeCompleteJobParameters(instructions.output),\n resultSink,\n });\n\n const runtime = yield* Effect.context<Database.Service>();\n const session = yield* EffectEx.acquireReleaseResource(() => new AiSession.Session({ feed, runtime }));\n\n yield* Effect.promise(() =>\n session.context.bind({\n skills: skillRefs,\n objects: data.chat ? [...objectRefs, data.chat] : objectRefs,\n }),\n );\n\n yield* session\n .createRequest({\n prompt: promptText,\n system: systemText,\n toolkit: promptToolkit,\n })\n .pipe(\n Effect.provide(\n Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations()),\n ),\n );\n\n return yield* Deferred.poll(resultSink).pipe(\n Effect.flatMap(Effect.fromOption),\n Effect.flatten,\n Effect.catchTag('NoSuchElementError', () =>\n Effect.gen(function* () {\n yield* session\n .createRequest({\n prompt: 'You must signal task completion by calling [completeJob] with the output or failure reason.',\n system: systemText,\n toolkit: promptToolkit,\n })\n .pipe(\n Effect.provide(\n Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations()),\n ),\n );\n\n return yield* Deferred.poll(resultSink).pipe(\n Effect.flatMap(Effect.fromOption),\n Effect.flatten,\n Effect.catchTag('NoSuchElementError', () =>\n Effect.fail(new PromptError('Agent did not signal task completion.', {})),\n ),\n );\n }),\n ),\n );\n },\n // v4 dropped `tapBoth`; `onExit` runs the finalizer on either outcome.\n Effect.onExit(() => Database.flush()),\n Effect.scoped,\n ),\n ),\n Operation.opaqueHandler,\n);\n\nconst makePromptAgentToolkit = (options: {\n completeJobTool: ReturnType<typeof makeCompleteJobTool>;\n parameters: ReturnType<typeof makeCompleteJobParameters>;\n resultSink: Deferred.Deferred<unknown, PromptError>;\n}) => {\n class PromptAgentToolkit extends Toolkit.make(options.completeJobTool) {}\n const layer = PromptAgentToolkit.toLayer({\n completeJob: Effect.fnUntraced(function* (input) {\n // A dynamic tool's input is unvalidated; a decode failure is reported to the model as a\n // tool failure so it can correct the call.\n const result = yield* Schema.decodeUnknownEffect(options.parameters)(input).pipe(\n Effect.mapError((error) => String(error)),\n );\n // A success payload wins over a failure sent alongside it, so a placeholder cannot discard\n // completed work.\n if (result.success == null && result.failure) {\n yield* Deferred.fail(\n options.resultSink,\n new PromptError(result.failure.message, {\n description: result.failure.description ?? undefined,\n }),\n );\n } else {\n yield* Deferred.succeed(options.resultSink, result.success ?? undefined);\n }\n }),\n });\n\n return OpaqueToolkit.make(PromptAgentToolkit, layer);\n};\n\ninterface ToolExecutionServiceOptions {\n feed: Feed.Feed;\n}\n\nconst ToolExecutionService = ({ feed }: ToolExecutionServiceOptions) =>\n Layer.unwrap(\n Effect.gen(function* () {\n const operationInvoker = yield* Operation.Service;\n return makeToolExecutionService({\n invoke: (tool, input) =>\n Effect.gen(function* () {\n const operationDef = getOperationFromTool(tool).pipe(Option.getOrThrow);\n log('invoking operation', { operationDef, input });\n const result = yield* operationInvoker\n .invoke(operationDef, input, {\n conversation: Obj.getURI(feed),\n })\n .pipe(Effect.orDie);\n log('result', { result });\n return result;\n }),\n });\n }),\n );\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"chunk-run-instructions.mjs","names":["DXN"],"sources":["../../src/operations/complete-job-tool.ts","../../src/operations/run-instructions.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Tool from 'effect/ai/Tool';\nimport * as Schema from 'effect/Schema';\n\nimport { JsonSchema } from '@dxos/echo';\n\n/** `Instructions.make` defaults `output` to `Schema.Void`; this is what that serializes to. */\nconst UNDECLARED_OUTPUT = JsonSchema.toJsonSchema(Schema.Void);\nconst UNDECLARED_TYPE = 'type' in UNDECLARED_OUTPUT ? UNDECLARED_OUTPUT.type : undefined;\n\n/**\n * Whether the routine's stored output carries a payload contract. `Instructions` keeps only the\n * serialized schema, so a declared `null` output is indistinguishable from a defaulted one — and\n * wants the same tool either way, having no payload to validate.\n */\nconst isUndeclaredOutput = (output: JsonSchema.JsonSchema): boolean =>\n ('$id' in output && output.$id === '/schemas/unknown') || ('type' in output && output.type === UNDECLARED_TYPE);\n\n/**\n * Accepts any JSON value, unlike `Schema.Any`, while serializing to concrete types. This matters\n * twice: the Anthropic API rejects a strict tool whose schema contains the empty `{}` subschema\n * `Schema.Any` serializes to, and — observed live — a schema-less `success` invites the model to\n * emit invalid JSON (digit-separated numbers such as `3,628,800`), which kills the sub-agent.\n * `ObjectKeyword` rather than `Record(String, Any)`: the provider's structured-output codec\n * rewrites records into [key, value] tuples whose value member is again the empty schema.\n */\nconst JsonPayload = Schema.Union([\n Schema.String,\n Schema.Number,\n Schema.Boolean,\n Schema.ObjectKeyword,\n Schema.Array(Schema.Any),\n]);\n\n/** The parameters `completeJob` decodes: the declared output (or any JSON payload) under `success`. */\nexport const makeCompleteJobParameters = (output: JsonSchema.JsonSchema) =>\n Schema.Struct({\n // Both fields accept `null` because models emit it for a field they mean to omit.\n success: Schema.optional(\n Schema.NullOr(isUndeclaredOutput(output) ? JsonPayload : JsonSchema.toEffectSchema(output)),\n ),\n failure: Schema.optional(\n Schema.NullOr(\n Schema.Struct({\n message: Schema.String.annotate({\n description: 'Short message describing the error.',\n }),\n description: Schema.optional(Schema.NullOr(Schema.String)).annotate({\n description: 'Optional longer message describing in detail what went wrong',\n }),\n }),\n ),\n ),\n });\n\n/**\n * The tool a routine signals completion with: its declared output under `success`, or a failure.\n *\n * Dynamic rather than static: a dynamic tool's JSON schema reaches the provider verbatim, while a\n * static tool is serialized through the provider's structured-output transformer, which rewrites\n * object members into typeless subschemas the Anthropic API rejects. The caller decodes the\n * (unvalidated) input against {@link makeCompleteJobParameters}, so what the model is told and\n * what is validated agree.\n */\nexport const makeCompleteJobTool = (output: JsonSchema.JsonSchema) =>\n Tool.dynamic('completeJob', {\n parameters: JsonSchema.toJsonSchema(makeCompleteJobParameters(output)),\n failure: Schema.String,\n }).annotate(Tool.Strict, false);\n","//\n// Copyright 2025 DXOS.org\n//\n\nimport * as Toolkit from 'effect/ai/Toolkit';\nimport * as Deferred from 'effect/Deferred';\nimport * as Effect from 'effect/Effect';\nimport * as Layer from 'effect/Layer';\nimport * as Option from 'effect/Option';\nimport * as Schema from 'effect/Schema';\n\nimport { loadMcpServers } from '@dxos/agent-runtime';\nimport { AiService, OpaqueToolkit } from '@dxos/ai';\nimport {\n AiSession,\n TrajectoryStore,\n getOperationFromTool,\n makeToolExecutionService,\n makeToolResolverFromOperations,\n} from '@dxos/assistant';\nimport * as Chat from '@dxos/assistant/Chat';\nimport * as Credential from '@dxos/compute/Credential';\nimport * as Operation from '@dxos/compute/Operation';\nimport * as Template from '@dxos/compute/Template';\nimport * as Trace from '@dxos/compute/Trace';\nimport { Database, Feed, Obj, Ref, Registry } from '@dxos/echo';\nimport * as EffectEx from '@dxos/effect/EffectEx';\nimport { invariant } from '@dxos/invariant';\nimport { DXN } from '@dxos/keys';\nimport { log } from '@dxos/log';\nimport { trim } from '@dxos/util';\n\nimport { PromptError } from '../errors.ts';\nimport * as AgentOperation from '../types/AgentOperation.ts';\nimport { makeCompleteJobParameters, makeCompleteJobTool } from './complete-job-tool.ts';\n\nconst DEFAULT_MODEL: DXN.DXN = DXN.make('com.anthropic.model.claude-opus-5.default');\n\nexport default AgentOperation.RunInstructions.pipe(\n Operation.withHandler(\n Effect.fnUntraced(\n function* (data) {\n log.info('processing input', { input: data.input });\n\n const input = yield* Ref.isRef(data.input)\n ? Database.load(data.input).pipe(Effect.map(Obj.toJSON))\n : Effect.succeed(data.input);\n\n yield* Database.flush();\n const instructions = yield* Database.load(data.instructions);\n yield* Trace.emitStatus(`Running ${instructions.id}`);\n\n log.info('starting agent', { instructions: instructions.id, input });\n\n // Bind the instructions' own refs, dropping any that no longer resolve. The refs must be\n // bound as-is (not re-wrapped via `Ref.make`) to preserve their registry DXN: bindings\n // are persisted to the conversation feed, and registry-only skills have no space-DB\n // identity, so an EID ref would not resolve when the binding is re-read.\n const skillRefs = yield* Effect.filter(instructions.skills, (ref) =>\n Database.load(ref).pipe(\n Effect.as(true),\n Effect.catchTag('EntityNotFoundError', () => Effect.succeed(false)),\n ),\n );\n\n // Bind the instructions' context objects (sibling of skills), dropping any that no longer resolve.\n const objectRefs = yield* Effect.filter(instructions.objects ?? [], (ref) =>\n Database.load(ref).pipe(\n Effect.as(true),\n Effect.catchTag('EntityNotFoundError', () => Effect.succeed(false)),\n ),\n );\n\n const textDoc = yield* Database.load(instructions.text);\n let promptText = Template.process(textDoc.content, input);\n\n if (input !== undefined) {\n promptText += `\\n<input>${JSON.stringify(input)}</input>`;\n }\n\n let systemText = trim`\n You are an agent running in the non-interactive mode.\n The user is unable to see what you are doing, and cannot answer any questions.\n Do not ask questions.\n Complete the task before you, and at the end call [completeJob] with {\"success\": <output>}.\n The output goes inside \"success\" — never at the top level, and never wrapped in a second\n \"success\" of its own.\n If you are unable to complete the task, call [completeJob] with {\"failure\": {\"message\": \"...\"}}.\n Pass one of the two, never both, and omit the field you do not use.\n If no output is required, call [completeJob] with an empty object: {}\n The success value must be strictly valid JSON: quote free text, and write numbers without\n digit separators (3628800, never 3,628,800).\n Do not stop until you call [completeJob].\n `;\n if (data.systemInstructions) {\n systemText += `\\n${data.systemInstructions}`;\n }\n\n const modelLayer = AiService.languageModel(DXN.getName(data.model ?? DEFAULT_MODEL));\n\n let feed: Feed.Feed;\n if (data.chat) {\n const chat = yield* Database.load(data.chat);\n invariant(Obj.instanceOf(Chat.Chat, chat), 'Expected Chat object.');\n feed = yield* Database.load(chat.feed);\n } else {\n feed = yield* Database.add(TrajectoryStore.makeFeed());\n }\n\n const resultSink = yield* Deferred.make<unknown, PromptError>();\n const promptToolkit = makePromptAgentToolkit({\n completeJobTool: makeCompleteJobTool(instructions.output),\n parameters: makeCompleteJobParameters(instructions.output),\n resultSink,\n });\n\n const runtime = yield* Effect.context<Database.Service>();\n const session = yield* EffectEx.acquireReleaseResource(() => new AiSession.Session({ feed, runtime }));\n\n yield* Effect.promise(() =>\n session.context.bind({\n skills: skillRefs,\n objects: data.chat ? [...objectRefs, data.chat] : objectRefs,\n }),\n );\n\n // The space's MCP connections, re-read each iteration so one the run adds connects on its next turn.\n const mcpServers = loadMcpServers({ feed }).pipe(\n Effect.provide(yield* Effect.context<Database.Service | Registry.Service | Credential.CredentialsService>()),\n );\n\n yield* session\n .createRequest({\n prompt: promptText,\n system: systemText,\n toolkit: promptToolkit,\n mcpServers,\n })\n .pipe(\n Effect.provide(\n Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations()),\n ),\n );\n\n return yield* Deferred.poll(resultSink).pipe(\n Effect.flatMap(Effect.fromOption),\n Effect.flatten,\n Effect.catchTag('NoSuchElementError', () =>\n Effect.gen(function* () {\n yield* session\n .createRequest({\n prompt: 'You must signal task completion by calling [completeJob] with the output or failure reason.',\n system: systemText,\n toolkit: promptToolkit,\n mcpServers,\n })\n .pipe(\n Effect.provide(\n Layer.mergeAll(modelLayer, ToolExecutionService({ feed }), makeToolResolverFromOperations()),\n ),\n );\n\n return yield* Deferred.poll(resultSink).pipe(\n Effect.flatMap(Effect.fromOption),\n Effect.flatten,\n Effect.catchTag('NoSuchElementError', () =>\n Effect.fail(new PromptError('Agent did not signal task completion.', {})),\n ),\n );\n }),\n ),\n );\n },\n // v4 dropped `tapBoth`; `onExit` runs the finalizer on either outcome.\n Effect.onExit(() => Database.flush()),\n Effect.scoped,\n ),\n ),\n Operation.opaqueHandler,\n);\n\nconst makePromptAgentToolkit = (options: {\n completeJobTool: ReturnType<typeof makeCompleteJobTool>;\n parameters: ReturnType<typeof makeCompleteJobParameters>;\n resultSink: Deferred.Deferred<unknown, PromptError>;\n}) => {\n class PromptAgentToolkit extends Toolkit.make(options.completeJobTool) {}\n const layer = PromptAgentToolkit.toLayer({\n completeJob: Effect.fnUntraced(function* (input) {\n // A dynamic tool's input is unvalidated; a decode failure is reported to the model as a\n // tool failure so it can correct the call.\n const result = yield* Schema.decodeUnknownEffect(options.parameters)(input).pipe(\n Effect.mapError((error) => String(error)),\n );\n // A success payload wins over a failure sent alongside it, so a placeholder cannot discard\n // completed work.\n if (result.success == null && result.failure) {\n yield* Deferred.fail(\n options.resultSink,\n new PromptError(result.failure.message, {\n description: result.failure.description ?? undefined,\n }),\n );\n } else {\n yield* Deferred.succeed(options.resultSink, result.success ?? undefined);\n }\n }),\n });\n\n return OpaqueToolkit.make(PromptAgentToolkit, layer);\n};\n\ninterface ToolExecutionServiceOptions {\n feed: Feed.Feed;\n}\n\nconst ToolExecutionService = ({ feed }: ToolExecutionServiceOptions) =>\n Layer.unwrap(\n Effect.gen(function* () {\n const operationInvoker = yield* Operation.Service;\n return makeToolExecutionService({\n invoke: (tool, input) =>\n Effect.gen(function* () {\n const operationDef = getOperationFromTool(tool).pipe(Option.getOrThrow);\n log('invoking operation', { operationDef, input });\n const result = yield* operationInvoker\n .invoke(operationDef, input, {\n conversation: Obj.getURI(feed),\n })\n .pipe(Effect.orDie);\n log('result', { result });\n return result;\n }),\n });\n }),\n );\n"],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { c as SetMcpConnection } from "./chunk-operations2.mjs";
|
|
2
|
+
import { n as mcpConnections, t as describe } from "./chunk-mcp-connections.mjs";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import { AiContext, Harness } from "@dxos/assistant";
|
|
5
|
+
import { Obj } from "@dxos/echo";
|
|
6
|
+
import * as Operation from "@dxos/compute/Operation";
|
|
7
|
+
//#region src/skills/skill-manager/operations/set-mcp-connection.ts
|
|
8
|
+
var set_mcp_connection_default = SetMcpConnection.pipe(Operation.withHandler(Effect.fnUntraced(function* ({ id, enabled }) {
|
|
9
|
+
const connection = (yield* mcpConnections).find((connection) => connection.id === id || Obj.getMeta(connection).key === id);
|
|
10
|
+
if (!connection) return yield* Effect.die(/* @__PURE__ */ new Error(`No connection or built-in MCP server ${id}.`));
|
|
11
|
+
const binder = yield* Harness.binder.pipe(Effect.orDie);
|
|
12
|
+
yield* Effect.promise(() => binder.setConnection(AiContext.connectionRef(connection), enabled));
|
|
13
|
+
return describe(connection, binder.getConnections());
|
|
14
|
+
})));
|
|
15
|
+
//#endregion
|
|
16
|
+
export { set_mcp_connection_default as default };
|
|
17
|
+
|
|
18
|
+
//# sourceMappingURL=chunk-set-mcp-connection.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"chunk-set-mcp-connection.mjs","names":[],"sources":["../../src/skills/skill-manager/operations/set-mcp-connection.ts"],"sourcesContent":["//\n// Copyright 2026 DXOS.org\n//\n\nimport * as Effect from 'effect/Effect';\n\nimport { AiContext, Harness } from '@dxos/assistant';\nimport * as Operation from '@dxos/compute/Operation';\nimport { Obj } from '@dxos/echo';\n\nimport { SetMcpConnection } from './definitions.ts';\nimport { describe, mcpConnections } from './mcp-connections.ts';\n\nexport default SetMcpConnection.pipe(\n Operation.withHandler(\n Effect.fnUntraced(function* ({ id, enabled }) {\n const connection = (yield* mcpConnections).find(\n (connection) => connection.id === id || Obj.getMeta(connection).key === id,\n );\n if (!connection) {\n return yield* Effect.die(new Error(`No connection or built-in MCP server ${id}.`));\n }\n const binder = yield* Harness.binder.pipe(Effect.orDie);\n yield* Effect.promise(() => binder.setConnection(AiContext.connectionRef(connection), enabled));\n return describe(connection, binder.getConnections());\n }),\n ),\n);\n"],"mappings":";;;;;;;AAaA,IAAA,6BAAe,iBAAiB,KAC9B,UAAU,YACR,OAAO,WAAW,WAAW,EAAE,IAAI,WAAW;CAC5C,MAAM,cAAc,OAAO,eAAA,CAAgB,MACxC,eAAe,WAAW,OAAO,MAAM,IAAI,QAAQ,UAAU,CAAC,CAAC,QAAQ,EAC1E;CACA,IAAI,CAAC,YACH,OAAO,OAAO,OAAO,oBAAI,IAAI,MAAM,wCAAwC,GAAG,EAAE,CAAC;CAEnF,MAAM,SAAS,OAAO,QAAQ,OAAO,KAAK,OAAO,KAAK;CACtD,OAAO,OAAO,cAAc,OAAO,cAAc,UAAU,cAAc,UAAU,GAAG,OAAO,CAAC;CAC9F,OAAO,SAAS,YAAY,OAAO,eAAe,CAAC;AACrD,CAAC,CACH,CACF"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { i as SyncAutomation, r as Relay } from "./chunk-
|
|
1
|
+
import { i as SyncAutomation, r as Relay } from "./chunk-operations6.mjs";
|
|
2
2
|
import * as Effect from "effect/Effect";
|
|
3
3
|
import * as Agent from "@dxos/assistant/Agent";
|
|
4
4
|
import { Database, Feed, Filter, Obj, Ref } from "@dxos/echo";
|
|
@@ -26,13 +26,27 @@ var shapeError = ({ task, create, assign, unassign, title, status }) => {
|
|
|
26
26
|
if (!create && !task) return "name an existing `task`, or set `create` to make a new one";
|
|
27
27
|
if (create && !title?.trim()) return "`create` needs a `title`";
|
|
28
28
|
if (assign && unassign) return "`assign` and `unassign` contradict each other";
|
|
29
|
-
if (unassign && (create || status === "started")) return "a task you create or start is
|
|
29
|
+
if (unassign && (create || status === "started")) return "a task you create or start is yours to work, so it cannot also be unassigned";
|
|
30
|
+
};
|
|
31
|
+
var claim = (task, self, { assigning, unassign }) => {
|
|
32
|
+
if (assigning) {
|
|
33
|
+
const answering = Task.owner(task) || Task.sameActor(task.assignee, self) ? void 0 : Task.owner(Task.getParentTask(task));
|
|
34
|
+
return {
|
|
35
|
+
delegate: self,
|
|
36
|
+
...answering ? { assignee: { ...answering } } : {}
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
if (unassign) return {
|
|
40
|
+
...Task.sameActor(task.delegate, self) || Task.isSubAgentRequest(task.delegate) ? { delegate: null } : {},
|
|
41
|
+
...Task.sameActor(task.assignee, self) ? { assignee: null } : {}
|
|
42
|
+
};
|
|
43
|
+
return {};
|
|
30
44
|
};
|
|
31
45
|
/**
|
|
32
46
|
* Creates, edits, assigns and unassigns the conversation's tasks. Every change is checked before any
|
|
33
47
|
* is applied, so a malformed batch writes nothing and the model can resend it whole.
|
|
34
48
|
*
|
|
35
|
-
* Assignment always moves both halves together — the chat's checklist and the task's
|
|
49
|
+
* Assignment always moves both halves together — the chat's checklist and the task's worker — so
|
|
36
50
|
* the checklist a conversation shows is the work its agent holds. Starting a task assigns it.
|
|
37
51
|
*/
|
|
38
52
|
var update_tasks_default = UpdateTasks.pipe(Operation.withHandler(Effect.fnUntraced(function* ({ changes }) {
|
|
@@ -88,7 +102,10 @@ var update_tasks_default = UpdateTasks.pipe(Operation.withHandler(Effect.fnUntra
|
|
|
88
102
|
Task.update(task, {
|
|
89
103
|
title: title?.trim(),
|
|
90
104
|
status,
|
|
91
|
-
...
|
|
105
|
+
...claim(task, self, {
|
|
106
|
+
assigning,
|
|
107
|
+
unassign
|
|
108
|
+
})
|
|
92
109
|
});
|
|
93
110
|
if (assigning) Chat.assignTasks(chat, [Ref.make(task)]);
|
|
94
111
|
else if (unassign) Chat.unassignTasks(chat, [Ref.make(task)]);
|