wherever-dev 0.23.0 → 0.25.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +29 -0
- package/dist/assistant-channels.d.ts +46 -1
- package/dist/assistant-channels.d.ts.map +1 -1
- package/dist/assistant-channels.js +57 -1
- package/dist/assistant-channels.js.map +1 -1
- package/dist/assistant-controller.d.ts +14 -0
- package/dist/assistant-controller.d.ts.map +1 -1
- package/dist/assistant-controller.js +26 -2
- package/dist/assistant-controller.js.map +1 -1
- package/dist/assistant-folder.d.ts +14 -1
- package/dist/assistant-folder.d.ts.map +1 -1
- package/dist/assistant-folder.js +33 -2
- package/dist/assistant-folder.js.map +1 -1
- package/dist/assistant-schedule.d.ts +42 -3
- package/dist/assistant-schedule.d.ts.map +1 -1
- package/dist/assistant-schedule.js +113 -2
- package/dist/assistant-schedule.js.map +1 -1
- package/dist/assistant-scheduler.d.ts +28 -6
- package/dist/assistant-scheduler.d.ts.map +1 -1
- package/dist/assistant-scheduler.js +59 -12
- package/dist/assistant-scheduler.js.map +1 -1
- package/dist/assistant-tool-text.d.ts.map +1 -1
- package/dist/assistant-tool-text.js +5 -1
- package/dist/assistant-tool-text.js.map +1 -1
- package/dist/assistant-tools.d.ts +65 -16
- package/dist/assistant-tools.d.ts.map +1 -1
- package/dist/assistant-tools.js +95 -9
- package/dist/assistant-tools.js.map +1 -1
- package/dist/attach-file-tool.d.ts +17 -0
- package/dist/attach-file-tool.d.ts.map +1 -1
- package/dist/attach-file-tool.js +44 -37
- package/dist/attach-file-tool.js.map +1 -1
- package/dist/cli-requests.d.ts +2 -1
- package/dist/cli-requests.d.ts.map +1 -1
- package/dist/cli-requests.js.map +1 -1
- package/dist/commands/config.d.ts +28 -0
- package/dist/commands/config.d.ts.map +1 -0
- package/dist/commands/config.js +128 -0
- package/dist/commands/config.js.map +1 -0
- package/dist/commands/install.d.ts.map +1 -1
- package/dist/commands/install.js +2 -0
- package/dist/commands/install.js.map +1 -1
- package/dist/config-dir.d.ts +13 -0
- package/dist/config-dir.d.ts.map +1 -1
- package/dist/config-dir.js +13 -0
- package/dist/config-dir.js.map +1 -1
- package/dist/index.js +192 -44
- package/dist/index.js.map +1 -1
- package/dist/protocol.d.ts +7 -0
- package/dist/protocol.d.ts.map +1 -1
- package/dist/session-pool.d.ts +32 -6
- package/dist/session-pool.d.ts.map +1 -1
- package/dist/session-pool.js +94 -37
- package/dist/session-pool.js.map +1 -1
- package/dist/telegram-channel.d.ts +14 -2
- package/dist/telegram-channel.d.ts.map +1 -1
- package/dist/telegram-channel.js +41 -8
- package/dist/telegram-channel.js.map +1 -1
- package/dist/telegram-replies.d.ts +18 -0
- package/dist/telegram-replies.d.ts.map +1 -1
- package/dist/telegram-replies.js +41 -23
- package/dist/telegram-replies.js.map +1 -1
- package/package.json +1 -1
- package/public/_app/immutable/chunks/{FePVnZ_7.js → CRvF0-wF.js} +2 -2
- package/public/_app/immutable/chunks/{FePVnZ_7.js.map → CRvF0-wF.js.map} +1 -1
- package/public/_app/immutable/chunks/{CLKlGLL7.js → ClUQt0nO.js} +2 -2
- package/public/_app/immutable/chunks/{CLKlGLL7.js.map → ClUQt0nO.js.map} +1 -1
- package/public/_app/immutable/chunks/{BHw5ar2A.js → XW0SPyOK.js} +2 -2
- package/public/_app/immutable/chunks/{BHw5ar2A.js.map → XW0SPyOK.js.map} +1 -1
- package/public/_app/immutable/entry/{app.BJxkSaKZ.js → app.D1EX_9pb.js} +3 -3
- package/public/_app/immutable/entry/{app.BJxkSaKZ.js.map → app.D1EX_9pb.js.map} +1 -1
- package/public/_app/immutable/entry/start.ga0QZFSJ.js +2 -0
- package/public/_app/immutable/entry/start.ga0QZFSJ.js.map +1 -0
- package/public/_app/immutable/nodes/{0.DGFJlad5.js → 0.DsJW22vw.js} +2 -2
- package/public/_app/immutable/nodes/{0.DGFJlad5.js.map → 0.DsJW22vw.js.map} +1 -1
- package/public/_app/immutable/nodes/{1.Cy3IVwDh.js → 1.BsL25UTD.js} +2 -2
- package/public/_app/immutable/nodes/{1.Cy3IVwDh.js.map → 1.BsL25UTD.js.map} +1 -1
- package/public/_app/immutable/nodes/2.DO5lRCyx.js +124 -0
- package/public/_app/immutable/nodes/2.DO5lRCyx.js.map +1 -0
- package/public/_app/version.json +1 -1
- package/public/index.html +10 -10
- package/public/service-worker.js +1 -1
- package/public/_app/immutable/entry/start.CRP1MCwE.js +0 -2
- package/public/_app/immutable/entry/start.CRP1MCwE.js.map +0 -1
- package/public/_app/immutable/nodes/2.eb9p7ShF.js +0 -123
- package/public/_app/immutable/nodes/2.eb9p7ShF.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-tool-text.d.ts","sourceRoot":"","sources":["../src/assistant-tool-text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,2BAA2B,EAAE,iBAoBzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,iBAW1C,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,iBAU5C,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,iBAWzC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,
|
|
1
|
+
{"version":3,"file":"assistant-tool-text.d.ts","sourceRoot":"","sources":["../src/assistant-tool-text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,gBAAgB,EAAE,MAAM,EAAE,CAAC;CAC5B;AAED,eAAO,MAAM,2BAA2B,EAAE,iBAoBzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,iBAW1C,CAAC;AAEF,eAAO,MAAM,8BAA8B,EAAE,iBAU5C,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,iBAWzC,CAAC;AAEF,eAAO,MAAM,qBAAqB,EAAE,iBAoBnC,CAAC;AAEF,mGAAmG;AACnG,eAAO,MAAM,6BAA6B,EAAE,SAAS,iBAAiB,EAKrE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,SAAS,iBAAiB,EAA8D,CAAC;AAE5H,kGAAkG;AAClG,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAErD"}
|
|
@@ -75,11 +75,15 @@ export const ASSISTANT_NOTIFY_TEXT = {
|
|
|
75
75
|
'their message: a scheduled job, or work in another session, is silent unless it calls this. Give a short ' +
|
|
76
76
|
'`title` and a `body`. Tapping the notification opens `navigateSessionId` when given; otherwise, for a ' +
|
|
77
77
|
'scheduled job (pass `jobId`, or call it from an isolated job session), the session that scheduled the ' +
|
|
78
|
-
'job; otherwise this session.
|
|
78
|
+
'job; otherwise this session. To send files with it, pass `attachments`: paths relative to the working ' +
|
|
79
|
+
'directory, or absolute, as attach_file takes them (a path that does not exist is an error). Telegram ' +
|
|
80
|
+
'gets each file itself, after the message; a push notification cannot carry files. It fails with a ' +
|
|
81
|
+
'clear error when no channel can deliver.',
|
|
79
82
|
promptSnippet: "Notify the user immediately (push / Telegram); the only way to reach them with anything that is not a reply",
|
|
80
83
|
promptGuidelines: [
|
|
81
84
|
'Use assistant_notify only for things the user should know about now (a finished job, a result they asked to be told about, something urgent); never for routine chatter, and not to repeat what you are already replying.',
|
|
82
85
|
'In a scheduled job, call assistant_notify with the result when the user should hear about it: a scheduled turn reaches the user ONLY through assistant_notify.',
|
|
86
|
+
"When the result is a file (a report, an export), pass it in assistant_notify's attachments so it reaches the user on Telegram itself; attach_file alone only offers it for download in the web app.",
|
|
83
87
|
],
|
|
84
88
|
};
|
|
85
89
|
/** The schedule and timezone tools' text (registered in every server session while configured). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-tool-text.js","sourceRoot":"","sources":["../src/assistant-tool-text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAUH,MAAM,CAAC,MAAM,2BAA2B,GAAsB;IAC5D,IAAI,EAAE,wBAAwB;IAC9B,KAAK,EAAE,qBAAqB;IAC5B,WAAW,EACT,2GAA2G;QAC3G,0GAA0G;QAC1G,yGAAyG;QACzG,2GAA2G;QAC3G,4GAA4G;QAC5G,wGAAwG;QACxG,0GAA0G;QAC1G,2GAA2G;QAC3G,0GAA0G;IAC5G,aAAa,EACX,gIAAgI;IAClI,gBAAgB,EAAE;QAChB,gOAAgO;QAChO,gIAAgI;QAChI,sKAAsK;KACvK;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAsB;IAC7D,IAAI,EAAE,yBAAyB;IAC/B,KAAK,EAAE,0BAA0B;IACjC,WAAW,EACT,6GAA6G;QAC7G,2GAA2G;QAC3G,mFAAmF;IACrF,aAAa,EAAE,uFAAuF;IACtG,gBAAgB,EAAE;QAChB,gHAAgH;KACjH;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAsB;IAC/D,IAAI,EAAE,2BAA2B;IACjC,KAAK,EAAE,uBAAuB;IAC9B,WAAW,EACT,2GAA2G;QAC3G,yCAAyC;IAC3C,aAAa,EAAE,2DAA2D;IAC1E,gBAAgB,EAAE;QAChB,+FAA+F;KAChG;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAsB;IAC5D,IAAI,EAAE,wBAAwB;IAC9B,KAAK,EAAE,yBAAyB;IAChC,WAAW,EACT,2GAA2G;QAC3G,2GAA2G;QAC3G,2DAA2D;IAC7D,aAAa,EAAE,yFAAyF;IACxG,gBAAgB,EAAE;QAChB,2GAA2G;KAC5G;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAsB;IACtD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,mBAAmB;IAC1B,WAAW,EACT,yGAAyG;QACzG,yGAAyG;QACzG,uGAAuG;QACvG,2GAA2G;QAC3G,wGAAwG;QACxG,wGAAwG;QACxG,
|
|
1
|
+
{"version":3,"file":"assistant-tool-text.js","sourceRoot":"","sources":["../src/assistant-tool-text.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAUH,MAAM,CAAC,MAAM,2BAA2B,GAAsB;IAC5D,IAAI,EAAE,wBAAwB;IAC9B,KAAK,EAAE,qBAAqB;IAC5B,WAAW,EACT,2GAA2G;QAC3G,0GAA0G;QAC1G,yGAAyG;QACzG,2GAA2G;QAC3G,4GAA4G;QAC5G,wGAAwG;QACxG,0GAA0G;QAC1G,2GAA2G;QAC3G,0GAA0G;IAC5G,aAAa,EACX,gIAAgI;IAClI,gBAAgB,EAAE;QAChB,gOAAgO;QAChO,gIAAgI;QAChI,sKAAsK;KACvK;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAsB;IAC7D,IAAI,EAAE,yBAAyB;IAC/B,KAAK,EAAE,0BAA0B;IACjC,WAAW,EACT,6GAA6G;QAC7G,2GAA2G;QAC3G,mFAAmF;IACrF,aAAa,EAAE,uFAAuF;IACtG,gBAAgB,EAAE;QAChB,gHAAgH;KACjH;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,8BAA8B,GAAsB;IAC/D,IAAI,EAAE,2BAA2B;IACjC,KAAK,EAAE,uBAAuB;IAC9B,WAAW,EACT,2GAA2G;QAC3G,yCAAyC;IAC3C,aAAa,EAAE,2DAA2D;IAC1E,gBAAgB,EAAE;QAChB,+FAA+F;KAChG;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAsB;IAC5D,IAAI,EAAE,wBAAwB;IAC9B,KAAK,EAAE,yBAAyB;IAChC,WAAW,EACT,2GAA2G;QAC3G,2GAA2G;QAC3G,2DAA2D;IAC7D,aAAa,EAAE,yFAAyF;IACxG,gBAAgB,EAAE;QAChB,2GAA2G;KAC5G;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAsB;IACtD,IAAI,EAAE,kBAAkB;IACxB,KAAK,EAAE,mBAAmB;IAC1B,WAAW,EACT,yGAAyG;QACzG,yGAAyG;QACzG,uGAAuG;QACvG,2GAA2G;QAC3G,wGAAwG;QACxG,wGAAwG;QACxG,wGAAwG;QACxG,uGAAuG;QACvG,oGAAoG;QACpG,0CAA0C;IAC5C,aAAa,EAAE,6GAA6G;IAC5H,gBAAgB,EAAE;QAChB,2NAA2N;QAC3N,gKAAgK;QAChK,qMAAqM;KACtM;CACF,CAAC;AAEF,mGAAmG;AACnG,MAAM,CAAC,MAAM,6BAA6B,GAAiC;IACzE,2BAA2B;IAC3B,4BAA4B;IAC5B,8BAA8B;IAC9B,2BAA2B;CAC5B,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAAiC,CAAC,GAAG,6BAA6B,EAAE,qBAAqB,CAAC,CAAC;AAE5H,kGAAkG;AAClG,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,OAAO,4BAA4B,QAAQ,EAAE,CAAC;AAChD,CAAC"}
|
|
@@ -1,23 +1,29 @@
|
|
|
1
1
|
import type { InlineExtension, ToolDefinition } from '@earendil-works/pi-coding-agent';
|
|
2
2
|
import { type ScheduleJob } from './assistant-schedule.js';
|
|
3
3
|
import type { ScheduleListing } from './assistant-scheduler.js';
|
|
4
|
-
import type { ChannelNotification, NotifyOutcome } from './assistant-channels.js';
|
|
4
|
+
import type { ChannelFile, ChannelNotification, NotifyOutcome } from './assistant-channels.js';
|
|
5
5
|
/**
|
|
6
6
|
* The assistant's SCHEDULE and TIMEZONE tools for server-built sessions (spec
|
|
7
7
|
* `assistant-session-and-channels`, ADR 0015), plus the per-turn timezone line.
|
|
8
8
|
*
|
|
9
9
|
* - `assistant_schedule_add`, `assistant_schedule_list`, `assistant_schedule_remove`,
|
|
10
10
|
* `assistant_set_timezone`: registered in EVERY server session (not only the
|
|
11
|
-
* assistant's) while
|
|
11
|
+
* assistant's) while the assistant is ACTIVE, so any session's agent can
|
|
12
12
|
* hand a job to the assistant. Every job belongs to and runs as the assistant;
|
|
13
13
|
* the calling session is stamped as `originSessionId` / `originCwd` (context,
|
|
14
14
|
* not the execution location). Self-contained in the `say` / `attach_file`
|
|
15
15
|
* style: each `execute` calls the scheduler directly (its write queue and its
|
|
16
16
|
* timezone setter), no bridge, no side channel.
|
|
17
17
|
* - When configured but NOT active (another server holds the folder lock, or the
|
|
18
|
-
* lock could not be taken), the
|
|
19
|
-
*
|
|
20
|
-
*
|
|
18
|
+
* lock could not be taken), the pool gets no hooks: no tool is registered and
|
|
19
|
+
* no timezone line is added, exactly as with `assistantFolder` unset
|
|
20
|
+
* (assistant-schedule-tools-absent-when-not-active, reversing the earlier
|
|
21
|
+
* "same tool set whatever the lock says" decision: a refused server is a
|
|
22
|
+
* misconfiguration already reported in the log and status, and tools that can
|
|
23
|
+
* only fail add prompt noise and invite retries). The lock-state error is still
|
|
24
|
+
* what the CLI twin ops answer, and what the tools answer in the short boot
|
|
25
|
+
* window where the assistant is active but the scheduler has not started.
|
|
26
|
+
* (`assistantNotActiveError` is that message.)
|
|
21
27
|
* - `assistant_notify` (channel-seam-notify-and-web-push, ADR 0014): the one way
|
|
22
28
|
* to reach the user proactively, delivered at once to every channel through
|
|
23
29
|
* the dispatcher (assistant-channels.ts). Registered ONLY while the assistant
|
|
@@ -25,8 +31,9 @@ import type { ChannelNotification, NotifyOutcome } from './assistant-channels.js
|
|
|
25
31
|
* - The timezone line (`User's current timezone: <tz>`) is an INLINE pi extension
|
|
26
32
|
* (ADR 0004's conversation-mode pattern): `before_agent_start` APPENDS it to
|
|
27
33
|
* the prompt the event carries, never replacing it. It is added only to a
|
|
28
|
-
* session whose cwd is `assistantFolder` itself or its `jobs/` (
|
|
29
|
-
*
|
|
34
|
+
* session whose cwd is `assistantFolder` itself or its `jobs/` (compared
|
|
35
|
+
* with symlinks resolved, `canonicalPath`, like the controller's pointer
|
|
36
|
+
* check), and appends nothing while no
|
|
30
37
|
* timezone is known (assistant not active).
|
|
31
38
|
*
|
|
32
39
|
* The ops (`scheduleAdd`, ...) are separate from the tool wrappers so
|
|
@@ -41,6 +48,8 @@ export interface AssistantScheduleBackend {
|
|
|
41
48
|
removeJob(id: string): Promise<boolean>;
|
|
42
49
|
list(): ScheduleListing;
|
|
43
50
|
getUserTimezone(): string;
|
|
51
|
+
/** Who set the current zone (the latest history entry's `source`), null when unknown. */
|
|
52
|
+
getUserTimezoneSource(): string | null;
|
|
44
53
|
setUserTimezone(timezone: string, source: string): boolean;
|
|
45
54
|
}
|
|
46
55
|
/** Whether the tools can act now: the backend while active, else the lock-state error. */
|
|
@@ -80,8 +89,11 @@ export type AssistantNotifyAccess = {
|
|
|
80
89
|
};
|
|
81
90
|
/**
|
|
82
91
|
* What the pool needs to give a server session its assistant tools and, in the
|
|
83
|
-
* assistant folder, its timezone line.
|
|
84
|
-
*
|
|
92
|
+
* assistant folder, its timezone line. Built while `assistantFolder` is
|
|
93
|
+
* configured (the CLI twin ops read it then, answering the lock-state error
|
|
94
|
+
* when not active), but set on the pool ONLY while the assistant is active
|
|
95
|
+
* (`SessionPool.setAssistantSessionHooks`): a refused server's sessions get no
|
|
96
|
+
* assistant tools and no timezone line.
|
|
85
97
|
*/
|
|
86
98
|
export interface AssistantSessionHooks {
|
|
87
99
|
/** The configured (resolved) assistant folder. */
|
|
@@ -92,8 +104,10 @@ export interface AssistantSessionHooks {
|
|
|
92
104
|
* `assistant_notify`'s backend, read at every call. Set ONLY while the
|
|
93
105
|
* assistant is ACTIVE (configured AND this server holds the folder lock):
|
|
94
106
|
* without it the tool is not registered at all (decision, per the task's
|
|
95
|
-
* acceptance criteria:
|
|
96
|
-
*
|
|
107
|
+
* acceptance criteria: a refused server's sessions do not see
|
|
108
|
+
* `assistant_notify`, since no channel could run there; since
|
|
109
|
+
* assistant-schedule-tools-absent-when-not-active the schedule tools follow
|
|
110
|
+
* the same rule, by the pool getting no hooks at all).
|
|
97
111
|
*/
|
|
98
112
|
notify?: () => AssistantNotifyAccess;
|
|
99
113
|
}
|
|
@@ -107,7 +121,7 @@ export type OpResult = {
|
|
|
107
121
|
};
|
|
108
122
|
/** The `source` recorded in the timezone history for a change made by `assistant_set_timezone`. */
|
|
109
123
|
export declare const SET_TIMEZONE_SOURCE = "assistant_set_timezone";
|
|
110
|
-
/** The `source` recorded for a change reported by a web client
|
|
124
|
+
/** The `source` recorded for a change reported by a web client (`webTimezoneReport`). */
|
|
111
125
|
export declare const WEB_TIMEZONE_SOURCE = "web";
|
|
112
126
|
/** The lock-state error a tool answers when the assistant is configured but not active here. */
|
|
113
127
|
export declare function assistantNotActiveError(lock: {
|
|
@@ -125,6 +139,27 @@ export declare function scheduleAdd(backend: AssistantScheduleBackend, caller: A
|
|
|
125
139
|
export declare function scheduleList(backend: AssistantScheduleBackend, caller: AssistantToolCaller): OpResult;
|
|
126
140
|
export declare function scheduleRemove(backend: AssistantScheduleBackend, args: unknown): Promise<OpResult>;
|
|
127
141
|
export declare function setTimezone(backend: AssistantScheduleBackend, args: unknown, source?: string): OpResult;
|
|
142
|
+
/** A web client's timezone report (`client_timezone`), as the server reads it. */
|
|
143
|
+
export interface WebTimezoneReport {
|
|
144
|
+
timezone: unknown;
|
|
145
|
+
/**
|
|
146
|
+
* True when this is the device's FIRST report (it remembers no earlier one).
|
|
147
|
+
* Absent (an older web, which reported on every connect) reads as a
|
|
148
|
+
* non-first report, i.e. the previous "applies when it differs" behaviour.
|
|
149
|
+
*/
|
|
150
|
+
first?: unknown;
|
|
151
|
+
}
|
|
152
|
+
/**
|
|
153
|
+
* Apply a web client's timezone report (ADR 0019: a report is a signal that a
|
|
154
|
+
* DEVICE MOVED, not a reading of where the user is). The web sends one only
|
|
155
|
+
* when the browser's zone differs from the last zone that browser reported.
|
|
156
|
+
* A non-first report applies when it differs (like `assistant_set_timezone`,
|
|
157
|
+
* through the scheduler's setter, source `web`). A FIRST report applies only
|
|
158
|
+
* when the current zone was not set by `assistant_set_timezone` (its latest
|
|
159
|
+
* history source); otherwise it is ignored: nothing written, nothing recorded,
|
|
160
|
+
* nothing pushed (`details.ignored: true`). An unknown zone is an error.
|
|
161
|
+
*/
|
|
162
|
+
export declare function webTimezoneReport(backend: AssistantScheduleBackend, report: WebTimezoneReport): OpResult;
|
|
128
163
|
/** How the tap target was chosen (the precedence of `resolveNotifyTarget`). */
|
|
129
164
|
export type NotifyTargetVia = 'navigateSessionId' | 'job' | 'caller';
|
|
130
165
|
export interface NotifyTarget {
|
|
@@ -158,6 +193,20 @@ export declare function resolveNotifyTarget(input: {
|
|
|
158
193
|
* (sessions are mostly unnamed, and the folder is what the sidebar groups by).
|
|
159
194
|
*/
|
|
160
195
|
export declare function notifySource(callerCwd: string, job: JobOrigin | null): string;
|
|
196
|
+
/**
|
|
197
|
+
* `attachments`, resolved against the caller's cwd exactly as `attach_file`
|
|
198
|
+
* does (`resolveAttachPath`), so a typo comes back to the agent before anything
|
|
199
|
+
* is sent. No download grant comes of it (download-grants.ts counts only
|
|
200
|
+
* `attach_file` results): the files go to the channels that carry files
|
|
201
|
+
* (Telegram), and the web serves them only once the agent also attaches them.
|
|
202
|
+
*/
|
|
203
|
+
export declare function notifyAttachments(cwd: string, raw: unknown): {
|
|
204
|
+
ok: true;
|
|
205
|
+
files: ChannelFile[];
|
|
206
|
+
} | {
|
|
207
|
+
ok: false;
|
|
208
|
+
error: string;
|
|
209
|
+
};
|
|
161
210
|
/** `assistant_notify`: deliver to every channel at once, with the tap target per `resolveNotifyTarget`. */
|
|
162
211
|
export declare function notifyOp(backend: AssistantNotifyBackend, caller: AssistantToolCaller, args: unknown): Promise<OpResult>;
|
|
163
212
|
/** The text of the settings' "Send test notification" (`POST /push/test`). */
|
|
@@ -184,8 +233,8 @@ export type AssistantCliOp = (args: unknown, caller: AssistantToolCaller) => Pro
|
|
|
184
233
|
* server tool it twins, behind the same gates: `hooks` undefined (assistant not
|
|
185
234
|
* configured) answers `ASSISTANT_NOT_CONFIGURED_ERROR`; configured but not
|
|
186
235
|
* active answers the lock-state error, `notify` included (a server session has
|
|
187
|
-
* no
|
|
188
|
-
*
|
|
236
|
+
* no assistant tool at all then, but a CLI twin cannot be hidden server-side,
|
|
237
|
+
* so it gets the error). `caller` is resolved from the bridge
|
|
189
238
|
* registration, never from `args`.
|
|
190
239
|
*/
|
|
191
240
|
export declare function assistantCliOps(hooks: AssistantSessionHooks | undefined): Record<string, AssistantCliOp>;
|
|
@@ -211,8 +260,8 @@ export declare function createTimezoneLineExtension(getTimezone: () => string |
|
|
|
211
260
|
export declare function hooksTimezone(hooks: AssistantSessionHooks): string | null;
|
|
212
261
|
/**
|
|
213
262
|
* What a server session in `cwd` gets from the assistant: the four schedule
|
|
214
|
-
* tools (always,
|
|
215
|
-
* line extension. Empty with `hooks` undefined (assistant not
|
|
263
|
+
* tools (always, given hooks), `assistant_notify` (only with `hooks.notify`) and, only in the assistant folder or `jobs/`, the timezone
|
|
264
|
+
* line extension. Empty with `hooks` undefined (assistant unset or not active), so
|
|
216
265
|
* the session's tools and extensions are exactly as without the feature.
|
|
217
266
|
*/
|
|
218
267
|
export declare function assistantSessionParts(hooks: AssistantSessionHooks | undefined, cwd: string, caller: () => AssistantToolCaller): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-tools.d.ts","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAuC,eAAe,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAE5H,OAAO,EAA4D,KAAK,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACrH,OAAO,KAAK,EAAa,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"assistant-tools.d.ts","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
package/dist/assistant-tools.js
CHANGED
|
@@ -2,10 +2,12 @@ import path from 'node:path';
|
|
|
2
2
|
import { Type } from 'typebox';
|
|
3
3
|
import { isValidTimeZone } from './assistant-cron.js';
|
|
4
4
|
import { ScheduleFileError, ScheduleValidationError } from './assistant-schedule.js';
|
|
5
|
+
import { resolveAttachPath } from './attach-file-tool.js';
|
|
6
|
+
import { canonicalPath } from './assistant-folder.js';
|
|
5
7
|
import { ASSISTANT_NOTIFY_TEXT, ASSISTANT_SCHEDULE_ADD_TEXT, ASSISTANT_SCHEDULE_LIST_TEXT, ASSISTANT_SCHEDULE_REMOVE_TEXT, ASSISTANT_SET_TIMEZONE_TEXT, timezoneLine, } from './assistant-tool-text.js';
|
|
6
8
|
/** The `source` recorded in the timezone history for a change made by `assistant_set_timezone`. */
|
|
7
9
|
export const SET_TIMEZONE_SOURCE = 'assistant_set_timezone';
|
|
8
|
-
/** The `source` recorded for a change reported by a web client
|
|
10
|
+
/** The `source` recorded for a change reported by a web client (`webTimezoneReport`). */
|
|
9
11
|
export const WEB_TIMEZONE_SOURCE = 'web';
|
|
10
12
|
/** The lock-state error a tool answers when the assistant is configured but not active here. */
|
|
11
13
|
export function assistantNotActiveError(lock) {
|
|
@@ -132,6 +134,38 @@ export function setTimezone(backend, args, source = SET_TIMEZONE_SOURCE) {
|
|
|
132
134
|
details: { timezone: tz, changed },
|
|
133
135
|
};
|
|
134
136
|
}
|
|
137
|
+
/**
|
|
138
|
+
* Apply a web client's timezone report (ADR 0019: a report is a signal that a
|
|
139
|
+
* DEVICE MOVED, not a reading of where the user is). The web sends one only
|
|
140
|
+
* when the browser's zone differs from the last zone that browser reported.
|
|
141
|
+
* A non-first report applies when it differs (like `assistant_set_timezone`,
|
|
142
|
+
* through the scheduler's setter, source `web`). A FIRST report applies only
|
|
143
|
+
* when the current zone was not set by `assistant_set_timezone` (its latest
|
|
144
|
+
* history source); otherwise it is ignored: nothing written, nothing recorded,
|
|
145
|
+
* nothing pushed (`details.ignored: true`). An unknown zone is an error.
|
|
146
|
+
*/
|
|
147
|
+
export function webTimezoneReport(backend, report) {
|
|
148
|
+
const tz = str(report.timezone)?.trim();
|
|
149
|
+
if (!tz || !isValidTimeZone(tz))
|
|
150
|
+
return setTimezone(backend, { timezone: report.timezone }, WEB_TIMEZONE_SOURCE);
|
|
151
|
+
if (report.first === true) {
|
|
152
|
+
let source;
|
|
153
|
+
try {
|
|
154
|
+
source = backend.getUserTimezoneSource();
|
|
155
|
+
}
|
|
156
|
+
catch (err) {
|
|
157
|
+
return { ok: false, error: errorOf(err) };
|
|
158
|
+
}
|
|
159
|
+
if (source === SET_TIMEZONE_SOURCE) {
|
|
160
|
+
return {
|
|
161
|
+
ok: true,
|
|
162
|
+
text: `Ignored a new device's first report (${tz}): the user's timezone was set explicitly.`,
|
|
163
|
+
details: { timezone: tz, changed: false, ignored: true },
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
return setTimezone(backend, { timezone: tz }, WEB_TIMEZONE_SOURCE);
|
|
168
|
+
}
|
|
135
169
|
/**
|
|
136
170
|
* The tap target precedence of `assistant_notify` (pure): `navigateSessionId`
|
|
137
171
|
* when given; else, when a `jobId` is given or the caller is an isolated job
|
|
@@ -159,6 +193,50 @@ export function notifySource(callerCwd, job) {
|
|
|
159
193
|
const cwd = job?.originCwd || callerCwd;
|
|
160
194
|
return path.basename(path.resolve(cwd)) || cwd;
|
|
161
195
|
}
|
|
196
|
+
/**
|
|
197
|
+
* `attachments`, resolved against the caller's cwd exactly as `attach_file`
|
|
198
|
+
* does (`resolveAttachPath`), so a typo comes back to the agent before anything
|
|
199
|
+
* is sent. No download grant comes of it (download-grants.ts counts only
|
|
200
|
+
* `attach_file` results): the files go to the channels that carry files
|
|
201
|
+
* (Telegram), and the web serves them only once the agent also attaches them.
|
|
202
|
+
*/
|
|
203
|
+
export function notifyAttachments(cwd, raw) {
|
|
204
|
+
if (raw === undefined || raw === null)
|
|
205
|
+
return { ok: true, files: [] };
|
|
206
|
+
if (!Array.isArray(raw) || raw.some((p) => typeof p !== 'string' || !p.trim())) {
|
|
207
|
+
return { ok: false, error: '"attachments" must be a list of file paths' };
|
|
208
|
+
}
|
|
209
|
+
const files = [];
|
|
210
|
+
for (const p of raw) {
|
|
211
|
+
const found = resolveAttachPath(cwd, p.trim());
|
|
212
|
+
if (!found.ok)
|
|
213
|
+
return { ok: false, error: `attachments: ${found.error}` };
|
|
214
|
+
files.push({ path: found.path, name: path.basename(found.path) });
|
|
215
|
+
}
|
|
216
|
+
return { ok: true, files };
|
|
217
|
+
}
|
|
218
|
+
const FILE_STATUS_TEXT = {
|
|
219
|
+
photo: 'sent as a photo',
|
|
220
|
+
document: 'sent as a document',
|
|
221
|
+
missing: 'was gone by the time it was sent (a note was sent instead)',
|
|
222
|
+
'too-large': 'is too large to send (a note was sent instead)',
|
|
223
|
+
failed: 'could not be sent (a note was sent instead)',
|
|
224
|
+
};
|
|
225
|
+
/** The per-file outcome lines of a notify's deliveries, or a note when files were given and no channel carried them. */
|
|
226
|
+
function describeFileOutcomes(outcome, files) {
|
|
227
|
+
if (files.length === 0)
|
|
228
|
+
return '';
|
|
229
|
+
const carried = outcome.deliveries.filter((d) => d.result.ok && d.result.files);
|
|
230
|
+
if (carried.length === 0)
|
|
231
|
+
return ' No channel that carries files (Telegram) delivered, so the attachments were not sent; use attach_file to offer them for download in the web app.';
|
|
232
|
+
return carried
|
|
233
|
+
.map((d) => {
|
|
234
|
+
const list = (d.result.ok && d.result.files) || [];
|
|
235
|
+
const parts = list.map((f) => `${f.name} ${FILE_STATUS_TEXT[f.status] ?? f.status}${f.error ? ` (${f.error})` : ''}`);
|
|
236
|
+
return ` Files on ${d.channel}: ${parts.join('; ')}.`;
|
|
237
|
+
})
|
|
238
|
+
.join('');
|
|
239
|
+
}
|
|
162
240
|
/** `assistant_notify`: deliver to every channel at once, with the tap target per `resolveNotifyTarget`. */
|
|
163
241
|
export async function notifyOp(backend, caller, args) {
|
|
164
242
|
const a = (args ?? {});
|
|
@@ -166,6 +244,10 @@ export async function notifyOp(backend, caller, args) {
|
|
|
166
244
|
const body = str(a.body)?.trim() ?? '';
|
|
167
245
|
if (!title)
|
|
168
246
|
return { ok: false, error: 'a non-empty "title" is required' };
|
|
247
|
+
const attachments = notifyAttachments(caller.cwd, a.attachments);
|
|
248
|
+
if (!attachments.ok)
|
|
249
|
+
return { ok: false, error: attachments.error };
|
|
250
|
+
const files = attachments.files;
|
|
169
251
|
const navigateSessionId = str(a.navigateSessionId)?.trim() || undefined;
|
|
170
252
|
const jobId = str(a.jobId)?.trim() || undefined;
|
|
171
253
|
let callerJobId = null;
|
|
@@ -192,7 +274,7 @@ export async function notifyOp(backend, caller, args) {
|
|
|
192
274
|
if (!target.sessionId)
|
|
193
275
|
return { ok: false, error: 'this session has no id yet, so there is nothing to open; pass navigateSessionId' };
|
|
194
276
|
const source = notifySource(caller.cwd, target.job);
|
|
195
|
-
const outcome = await backend.notify({ title, body, source, navigate: target.sessionId });
|
|
277
|
+
const outcome = await backend.notify({ title, body, source, navigate: target.sessionId, ...(files.length ? { files } : {}) });
|
|
196
278
|
if (!outcome.ok)
|
|
197
279
|
return { ok: false, error: outcome.error };
|
|
198
280
|
const reached = outcome.deliveries
|
|
@@ -203,7 +285,8 @@ export async function notifyOp(backend, caller, args) {
|
|
|
203
285
|
return {
|
|
204
286
|
ok: true,
|
|
205
287
|
text: `Notified the user via ${reached.join(', ')}; tapping it opens session ${target.sessionId}${unknownJob}.` +
|
|
206
|
-
(failed.length > 0 ? ` Not delivered on: ${failed.join('; ')}.` : '')
|
|
288
|
+
(failed.length > 0 ? ` Not delivered on: ${failed.join('; ')}.` : '') +
|
|
289
|
+
describeFileOutcomes(outcome, files),
|
|
207
290
|
details: { target, source, deliveries: outcome.deliveries },
|
|
208
291
|
};
|
|
209
292
|
}
|
|
@@ -236,8 +319,8 @@ export const ASSISTANT_NOT_CONFIGURED_ERROR = 'the wherever assistant is not con
|
|
|
236
319
|
* server tool it twins, behind the same gates: `hooks` undefined (assistant not
|
|
237
320
|
* configured) answers `ASSISTANT_NOT_CONFIGURED_ERROR`; configured but not
|
|
238
321
|
* active answers the lock-state error, `notify` included (a server session has
|
|
239
|
-
* no
|
|
240
|
-
*
|
|
322
|
+
* no assistant tool at all then, but a CLI twin cannot be hidden server-side,
|
|
323
|
+
* so it gets the error). `caller` is resolved from the bridge
|
|
241
324
|
* registration, never from `args`.
|
|
242
325
|
*/
|
|
243
326
|
export function assistantCliOps(hooks) {
|
|
@@ -344,6 +427,9 @@ export function createNotifyTool(access, caller) {
|
|
|
344
427
|
body: Type.String({ description: 'The message itself: one or two sentences the user can act on.' }),
|
|
345
428
|
navigateSessionId: Type.Optional(Type.String({ description: 'The session id a tap should open (default: see the description).' })),
|
|
346
429
|
jobId: Type.Optional(Type.String({ description: 'The scheduled job this is about; a tap then opens the session that scheduled it.' })),
|
|
430
|
+
attachments: Type.Optional(Type.Array(Type.String(), {
|
|
431
|
+
description: 'Files to send with the notification: paths relative to the working directory, or absolute (as attach_file takes them).',
|
|
432
|
+
})),
|
|
347
433
|
}),
|
|
348
434
|
async execute(_toolCallId, params) {
|
|
349
435
|
const a = access();
|
|
@@ -357,8 +443,8 @@ export function createNotifyTool(access, caller) {
|
|
|
357
443
|
// The timezone line
|
|
358
444
|
/** True when `cwd` is the assistant folder itself or its `jobs/` (where the timezone line applies). */
|
|
359
445
|
export function isAssistantFolderCwd(cwd, folder) {
|
|
360
|
-
const c =
|
|
361
|
-
const f =
|
|
446
|
+
const c = canonicalPath(cwd);
|
|
447
|
+
const f = canonicalPath(folder);
|
|
362
448
|
return c === f || c === path.join(f, 'jobs');
|
|
363
449
|
}
|
|
364
450
|
/** Append the timezone line to the prompt the event carries (never replacing it). */
|
|
@@ -396,8 +482,8 @@ export function hooksTimezone(hooks) {
|
|
|
396
482
|
}
|
|
397
483
|
/**
|
|
398
484
|
* What a server session in `cwd` gets from the assistant: the four schedule
|
|
399
|
-
* tools (always,
|
|
400
|
-
* line extension. Empty with `hooks` undefined (assistant not
|
|
485
|
+
* tools (always, given hooks), `assistant_notify` (only with `hooks.notify`) and, only in the assistant folder or `jobs/`, the timezone
|
|
486
|
+
* line extension. Empty with `hooks` undefined (assistant unset or not active), so
|
|
401
487
|
* the session's tools and extensions are exactly as without the feature.
|
|
402
488
|
*/
|
|
403
489
|
export function assistantSessionParts(hooks, cwd, caller) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assistant-tools.js","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assistant-tools.js","sourceRoot":"","sources":["../src/assistant-tools.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,23 @@ import type { ToolDefinition } from '@earendil-works/pi-coding-agent';
|
|
|
23
23
|
* downloads disabled, or the file over `downloads.maxBytes`.
|
|
24
24
|
*/
|
|
25
25
|
export declare function createAttachFileTool(cwd: string, downloadsConfig?: () => DownloadsPolicy | undefined): ToolDefinition;
|
|
26
|
+
/**
|
|
27
|
+
* Resolve a file path the way `attach_file` does (shared with
|
|
28
|
+
* `assistant_notify`'s `attachments`): `~` is the home dir, a relative path is
|
|
29
|
+
* against `cwd`. It must name an existing regular file. `path` is the REAL path
|
|
30
|
+
* (it is what a download grant names, so it pins the file attached now, not
|
|
31
|
+
* whatever a symlink points at later); `lexical` is the resolved path before
|
|
32
|
+
* that. The error has no tool-name prefix.
|
|
33
|
+
*/
|
|
34
|
+
export declare function resolveAttachPath(cwd: string, rawPath: string): {
|
|
35
|
+
ok: true;
|
|
36
|
+
path: string;
|
|
37
|
+
lexical: string;
|
|
38
|
+
size: number;
|
|
39
|
+
} | {
|
|
40
|
+
ok: false;
|
|
41
|
+
error: string;
|
|
42
|
+
};
|
|
26
43
|
/** The slice of `WhereverConfig.downloads` the tool needs to predict a refusal. */
|
|
27
44
|
export interface DownloadsPolicy {
|
|
28
45
|
enabled?: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"attach-file-tool.d.ts","sourceRoot":"","sources":["../src/attach-file-tool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,eAAe,GAAE,MAAM,eAAe,GAAG,SAA2B,GACnE,cAAc,
|
|
1
|
+
{"version":3,"file":"attach-file-tool.d.ts","sourceRoot":"","sources":["../src/attach-file-tool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,MAAM,EACX,eAAe,GAAE,MAAM,eAAe,GAAG,SAA2B,GACnE,cAAc,CAyEhB;AAED;;;;;;;GAOG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,GACd;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAwB1F;AAED,mFAAmF;AACnF,MAAM,WAAW,eAAe;IAC9B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,6EAA6E;AAC7E,eAAO,MAAM,0BAA0B,QAAoB,CAAC;AAE5D;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,eAAe,GAAG,SAAS,EACnC,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,GACf,MAAM,GAAG,IAAI,CAgBf"}
|
package/dist/attach-file-tool.js
CHANGED
|
@@ -60,40 +60,16 @@ export function createAttachFileTool(cwd, downloadsConfig = () => undefined) {
|
|
|
60
60
|
isError: true,
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
|
-
|
|
64
|
-
if (
|
|
65
|
-
resolved = path.join(os.homedir(), resolved.slice(1));
|
|
66
|
-
}
|
|
67
|
-
else if (!path.isAbsolute(resolved)) {
|
|
68
|
-
resolved = path.resolve(cwd, resolved);
|
|
69
|
-
}
|
|
70
|
-
else {
|
|
71
|
-
resolved = path.resolve(resolved);
|
|
72
|
-
}
|
|
73
|
-
let size = null;
|
|
74
|
-
try {
|
|
75
|
-
const st = fs.statSync(resolved);
|
|
76
|
-
if (!st.isFile()) {
|
|
77
|
-
return {
|
|
78
|
-
content: [
|
|
79
|
-
{ type: 'text', text: `attach_file: not a regular file: ${resolved}` },
|
|
80
|
-
],
|
|
81
|
-
details: undefined,
|
|
82
|
-
isError: true,
|
|
83
|
-
};
|
|
84
|
-
}
|
|
85
|
-
size = st.size;
|
|
86
|
-
}
|
|
87
|
-
catch {
|
|
63
|
+
const found = resolveAttachPath(cwd, rawPath);
|
|
64
|
+
if (!found.ok) {
|
|
88
65
|
return {
|
|
89
|
-
content: [
|
|
90
|
-
{ type: 'text', text: `attach_file: file not found: ${resolved}` },
|
|
91
|
-
],
|
|
66
|
+
content: [{ type: 'text', text: `attach_file: ${found.error}` }],
|
|
92
67
|
details: undefined,
|
|
93
68
|
isError: true,
|
|
94
69
|
};
|
|
95
70
|
}
|
|
96
|
-
const
|
|
71
|
+
const { size } = found;
|
|
72
|
+
const refusal = downloadRefusal(downloadsConfig(), size, found.lexical);
|
|
97
73
|
if (refusal) {
|
|
98
74
|
return {
|
|
99
75
|
content: [{ type: 'text', text: refusal }],
|
|
@@ -101,14 +77,7 @@ export function createAttachFileTool(cwd, downloadsConfig = () => undefined) {
|
|
|
101
77
|
isError: true,
|
|
102
78
|
};
|
|
103
79
|
}
|
|
104
|
-
|
|
105
|
-
// pins the file attached now, not whatever a symlink points at later.
|
|
106
|
-
try {
|
|
107
|
-
resolved = fs.realpathSync(resolved);
|
|
108
|
-
}
|
|
109
|
-
catch {
|
|
110
|
-
// Raced away after the stat: keep the lexical path; the download will 404.
|
|
111
|
-
}
|
|
80
|
+
const resolved = found.path;
|
|
112
81
|
const filename = path.basename(resolved);
|
|
113
82
|
return {
|
|
114
83
|
content: [
|
|
@@ -123,6 +92,44 @@ export function createAttachFileTool(cwd, downloadsConfig = () => undefined) {
|
|
|
123
92
|
},
|
|
124
93
|
};
|
|
125
94
|
}
|
|
95
|
+
/**
|
|
96
|
+
* Resolve a file path the way `attach_file` does (shared with
|
|
97
|
+
* `assistant_notify`'s `attachments`): `~` is the home dir, a relative path is
|
|
98
|
+
* against `cwd`. It must name an existing regular file. `path` is the REAL path
|
|
99
|
+
* (it is what a download grant names, so it pins the file attached now, not
|
|
100
|
+
* whatever a symlink points at later); `lexical` is the resolved path before
|
|
101
|
+
* that. The error has no tool-name prefix.
|
|
102
|
+
*/
|
|
103
|
+
export function resolveAttachPath(cwd, rawPath) {
|
|
104
|
+
let resolved = rawPath;
|
|
105
|
+
if (resolved.startsWith('~')) {
|
|
106
|
+
resolved = path.join(os.homedir(), resolved.slice(1));
|
|
107
|
+
}
|
|
108
|
+
else if (!path.isAbsolute(resolved)) {
|
|
109
|
+
resolved = path.resolve(cwd, resolved);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
resolved = path.resolve(resolved);
|
|
113
|
+
}
|
|
114
|
+
let size;
|
|
115
|
+
try {
|
|
116
|
+
const st = fs.statSync(resolved);
|
|
117
|
+
if (!st.isFile())
|
|
118
|
+
return { ok: false, error: `not a regular file: ${resolved}` };
|
|
119
|
+
size = st.size;
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
return { ok: false, error: `file not found: ${resolved}` };
|
|
123
|
+
}
|
|
124
|
+
let real = resolved;
|
|
125
|
+
try {
|
|
126
|
+
real = fs.realpathSync(resolved);
|
|
127
|
+
}
|
|
128
|
+
catch {
|
|
129
|
+
// Raced away after the stat: keep the lexical path; the download will 404.
|
|
130
|
+
}
|
|
131
|
+
return { ok: true, path: real, lexical: resolved, size };
|
|
132
|
+
}
|
|
126
133
|
/** Default `downloads.maxBytes`, kept in step with GET /session/download. */
|
|
127
134
|
export const DEFAULT_DOWNLOAD_MAX_BYTES = 100 * 1024 * 1024;
|
|
128
135
|
/**
|