@ashx-j/lunr 0.2.27 → 0.2.28
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 +10 -1
- package/dist/builtin-extensions/narumiruna-pi-goal/src/accounting.d.ts.map +1 -1
- package/dist/builtin-extensions/narumiruna-pi-goal/src/accounting.js +5 -2
- package/dist/builtin-extensions/narumiruna-pi-goal/src/accounting.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/chain-root-attachment.d.ts +4 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/chain-root-attachment.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/chain-root-attachment.js +2 -0
- package/dist/builtin-extensions/pi-subagents/src/runs/background/chain-root-attachment.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/notify.d.ts +5 -0
- package/dist/builtin-extensions/pi-subagents/src/runs/background/notify.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/notify.js +2 -0
- package/dist/builtin-extensions/pi-subagents/src/runs/background/notify.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/subagent-runner.d.ts +5 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/subagent-runner.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/background/subagent-runner.js +68 -40
- package/dist/builtin-extensions/pi-subagents/src/runs/background/subagent-runner.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/execution.d.ts +0 -3
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/execution.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/execution.js +28 -4
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/execution.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/subagent-executor.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/subagent-executor.js +1 -0
- package/dist/builtin-extensions/pi-subagents/src/runs/foreground/subagent-executor.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.d.ts +7 -1
- package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.js +70 -38
- package/dist/builtin-extensions/pi-subagents/src/shared/session-tokens.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/shared/types.d.ts +9 -0
- package/dist/builtin-extensions/pi-subagents/src/shared/types.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/shared/types.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/slash/slash-commands.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/slash/slash-commands.js +13 -62
- package/dist/builtin-extensions/pi-subagents/src/slash/slash-commands.js.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/tui/render.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-subagents/src/tui/render.js +1 -1
- package/dist/builtin-extensions/pi-subagents/src/tui/render.js.map +1 -1
- package/dist/builtin-extensions/pi-tps.d.ts.map +1 -1
- package/dist/builtin-extensions/pi-tps.js +10 -2
- package/dist/builtin-extensions/pi-tps.js.map +1 -1
- package/dist/catalog/models.json +1 -1
- package/dist/catalog/providers/google-vertex.json +1 -1
- package/dist/catalog/providers/google.json +1 -1
- package/dist/catalog/publication.json +3 -3
- package/dist/core/agent-session.d.ts +6 -15
- package/dist/core/agent-session.d.ts.map +1 -1
- package/dist/core/agent-session.js +35 -50
- package/dist/core/agent-session.js.map +1 -1
- package/dist/core/cache-stats.d.ts +1 -1
- package/dist/core/cache-stats.d.ts.map +1 -1
- package/dist/core/cache-stats.js +1 -1
- package/dist/core/cache-stats.js.map +1 -1
- package/dist/core/compaction/branch-summarization.d.ts +2 -1
- package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
- package/dist/core/compaction/branch-summarization.js +1 -0
- package/dist/core/compaction/branch-summarization.js.map +1 -1
- package/dist/core/compaction/compaction.d.ts +5 -11
- package/dist/core/compaction/compaction.d.ts.map +1 -1
- package/dist/core/compaction/compaction.js +38 -92
- package/dist/core/compaction/compaction.js.map +1 -1
- package/dist/core/context-breakdown.d.ts +2 -2
- package/dist/core/context-breakdown.d.ts.map +1 -1
- package/dist/core/context-breakdown.js +22 -20
- package/dist/core/context-breakdown.js.map +1 -1
- package/dist/core/extensions/types.d.ts +3 -1
- package/dist/core/extensions/types.d.ts.map +1 -1
- package/dist/core/extensions/types.js.map +1 -1
- package/dist/core/session-manager.d.ts +5 -1
- package/dist/core/session-manager.d.ts.map +1 -1
- package/dist/core/session-manager.js +16 -1
- package/dist/core/session-manager.js.map +1 -1
- package/dist/core/usage-accounting.d.ts +47 -0
- package/dist/core/usage-accounting.d.ts.map +1 -0
- package/dist/core/usage-accounting.js +205 -0
- package/dist/core/usage-accounting.js.map +1 -0
- package/dist/core/usage-history.d.ts +1 -18
- package/dist/core/usage-history.d.ts.map +1 -1
- package/dist/core/usage-history.js +46 -114
- package/dist/core/usage-history.js.map +1 -1
- package/dist/gateway/mobile-commands.d.ts.map +1 -1
- package/dist/gateway/mobile-commands.js +13 -1
- package/dist/gateway/mobile-commands.js.map +1 -1
- package/dist/modes/interactive/components/context-view.d.ts.map +1 -1
- package/dist/modes/interactive/components/context-view.js +2 -2
- package/dist/modes/interactive/components/context-view.js.map +1 -1
- package/dist/modes/interactive/components/footer.d.ts.map +1 -1
- package/dist/modes/interactive/components/footer.js +8 -12
- package/dist/modes/interactive/components/footer.js.map +1 -1
- package/dist/modes/interactive/components/usage-view.d.ts +5 -0
- package/dist/modes/interactive/components/usage-view.d.ts.map +1 -1
- package/dist/modes/interactive/components/usage-view.js +21 -6
- package/dist/modes/interactive/components/usage-view.js.map +1 -1
- package/dist/modes/interactive/interactive-mode.d.ts +1 -5
- package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
- package/dist/modes/interactive/interactive-mode.js +55 -22
- package/dist/modes/interactive/interactive-mode.js.map +1 -1
- package/dist/node-runtime/{agent-session-services-KDMSPQDY.js → agent-session-services-RTUGP3XR.js} +5 -4
- package/dist/node-runtime/{builtin-extensions-OX6KELNX.js → builtin-extensions-N4EUD6SB.js} +1 -1
- package/dist/node-runtime/{chunk-A2WO6WIN.js → chunk-4QRUZ64T.js} +11 -5
- package/dist/node-runtime/{chunk-ZDJUR45D.js → chunk-BMRXLQWQ.js} +41 -38
- package/dist/node-runtime/{chunk-MQPKUHRN.js → chunk-DFMPRAQQ.js} +8 -8
- package/dist/node-runtime/{chunk-C3P6Q3B2.js → chunk-E5DQGNJI.js} +10 -10
- package/dist/node-runtime/{chunk-FIRA54AC.js → chunk-ICKGAKWX.js} +22 -55
- package/dist/node-runtime/{chunk-JWEVT363.js → chunk-JEK35V2M.js} +14 -8
- package/dist/node-runtime/{chunk-EPR2F3GU.js → chunk-PWHTSQC4.js} +15 -1
- package/dist/node-runtime/{chunk-AYHH7YSD.js → chunk-QT3F6UEV.js} +61 -30
- package/dist/node-runtime/{chunk-JQYNHAKX.js → chunk-RY3FJ6WI.js} +29 -27
- package/dist/node-runtime/{chunk-I2H5QMWW.js → chunk-STMX7W5I.js} +1 -1
- package/dist/node-runtime/chunk-SWWHZ2RI.js +158 -0
- package/dist/node-runtime/{chunk-QNVMKNNN.js → chunk-U3YVZ6UC.js} +4 -4
- package/dist/node-runtime/{command-3HMSY6W2.js → command-YRT7I2BW.js} +1 -1
- package/dist/node-runtime/{commands-OCSSEEWJ.js → commands-2ETOWWRA.js} +5 -5
- package/dist/node-runtime/{export-html-BRWF5AHI.js → export-html-DBQRRMAY.js} +1 -1
- package/dist/node-runtime/{gateway-6623C2U3.js → gateway-V6K2CDWN.js} +9 -9
- package/dist/node-runtime/{goal-AIHEDUYA.js → goal-J7TYMOBK.js} +9 -3
- package/dist/node-runtime/index.js +9 -8
- package/dist/node-runtime/{interactive-mode-FM5DNUSW.js → interactive-mode-ASZ7APYP.js} +7 -6
- package/dist/node-runtime/{lunr-cron-LKVA5CZZ.js → lunr-cron-WD3YH4CR.js} +4 -4
- package/dist/node-runtime/main.js +7 -6
- package/dist/node-runtime/{mobile-commands-XT3NQXLD.js → mobile-commands-ICUXFW5V.js} +2 -2
- package/dist/node-runtime/{pi-subagents-LT3CTO4E.js → pi-subagents-QPU3OXE4.js} +17 -62
- package/dist/node-runtime/rpc-entry.js +7 -6
- package/dist/node-runtime/{session-handoff-LNSPDTKY.js → session-handoff-LYH53ESV.js} +2 -2
- package/dist/node-runtime/{session-manager-YIFIAVGC.js → session-manager-ZJ3N5Q74.js} +1 -1
- package/dist/node-runtime/{subagent-executor-Q5F7DBVM.js → subagent-executor-UI6SHG3X.js} +294 -231
- package/docs/features.md +10 -0
- package/examples/extensions/custom-provider-anthropic/package-lock.json +2 -2
- package/examples/extensions/custom-provider-anthropic/package.json +1 -1
- package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
- package/examples/extensions/gondolin/package-lock.json +2 -2
- package/examples/extensions/gondolin/package.json +1 -1
- package/examples/extensions/sandbox/package-lock.json +2 -2
- package/examples/extensions/sandbox/package.json +1 -1
- package/examples/extensions/with-deps/package-lock.json +2 -2
- package/examples/extensions/with-deps/package.json +1 -1
- package/install-lock/package-lock.json +24 -24
- package/install-lock/package.json +2 -2
- package/npm-shrinkwrap.json +21 -21
- package/package.json +7 -7
|
@@ -3,13 +3,13 @@ import {
|
|
|
3
3
|
AgentBridge,
|
|
4
4
|
QUEUED,
|
|
5
5
|
startGatewayCron
|
|
6
|
-
} from "./chunk-
|
|
6
|
+
} from "./chunk-E5DQGNJI.js";
|
|
7
7
|
import {
|
|
8
8
|
CHAT_COMMANDS,
|
|
9
9
|
botCommandSpecs,
|
|
10
10
|
runChatCommand,
|
|
11
11
|
sendCommandReply
|
|
12
|
-
} from "./chunk-
|
|
12
|
+
} from "./chunk-U3YVZ6UC.js";
|
|
13
13
|
import {
|
|
14
14
|
acceptGatewayInput,
|
|
15
15
|
addAllowedUser,
|
|
@@ -34,7 +34,7 @@ import {
|
|
|
34
34
|
startGatewayPresenter,
|
|
35
35
|
stopButtonSweeper,
|
|
36
36
|
stopGatewayPresenter
|
|
37
|
-
} from "./chunk-
|
|
37
|
+
} from "./chunk-4QRUZ64T.js";
|
|
38
38
|
import {
|
|
39
39
|
createPairingStore
|
|
40
40
|
} from "./chunk-NNNR3QIY.js";
|
|
@@ -42,14 +42,14 @@ import {
|
|
|
42
42
|
claimGateway
|
|
43
43
|
} from "./chunk-WXYNALHD.js";
|
|
44
44
|
import "./chunk-CJECDQKP.js";
|
|
45
|
-
import "./chunk-
|
|
45
|
+
import "./chunk-RY3FJ6WI.js";
|
|
46
46
|
import "./chunk-IAZSK7KK.js";
|
|
47
47
|
import "./chunk-TCT6PCUR.js";
|
|
48
48
|
import {
|
|
49
49
|
isFeatureEnabled
|
|
50
50
|
} from "./chunk-LHV3V67B.js";
|
|
51
51
|
import "./chunk-URD2SLIT.js";
|
|
52
|
-
import "./chunk-
|
|
52
|
+
import "./chunk-ICKGAKWX.js";
|
|
53
53
|
import "./chunk-BYC6RKCN.js";
|
|
54
54
|
import "./chunk-CGBXPL3E.js";
|
|
55
55
|
import "./chunk-BBUVIEZB.js";
|
|
@@ -59,8 +59,8 @@ import "./chunk-BDRGN3L2.js";
|
|
|
59
59
|
import "./chunk-FY4A63RK.js";
|
|
60
60
|
import "./chunk-RYRGL7P4.js";
|
|
61
61
|
import "./chunk-ES6PBSIE.js";
|
|
62
|
-
import "./chunk-
|
|
63
|
-
import "./chunk-
|
|
62
|
+
import "./chunk-STMX7W5I.js";
|
|
63
|
+
import "./chunk-PWHTSQC4.js";
|
|
64
64
|
import "./chunk-FVDOXRUD.js";
|
|
65
65
|
import "./chunk-IMLCWLPI.js";
|
|
66
66
|
import "./chunk-MNQXDFPV.js";
|
|
@@ -370,7 +370,7 @@ var DiscordAdapter = class {
|
|
|
370
370
|
return await interaction.respond([]), !0;
|
|
371
371
|
let query = String(interaction.options.getFocused()).toLowerCase(), values = [];
|
|
372
372
|
if (interaction.commandName === "mode" && (values = ["yolo", "auto", "read-only"]), this.commandSuggestions && ["thinking", "model"].includes(interaction.commandName) && (values = [...await this.commandSuggestions(source, interaction.commandName)]), interaction.commandName === "project" && (values = cfg.projectRoots ?? []), interaction.commandName === "sessions") {
|
|
373
|
-
let { SessionManager } = await import("./session-manager-
|
|
373
|
+
let { SessionManager } = await import("./session-manager-ZJ3N5Q74.js");
|
|
374
374
|
values = (await Promise.race([
|
|
375
375
|
SessionManager.listAll(),
|
|
376
376
|
new Promise((resolve) => setTimeout(() => resolve([]), 1500))
|
|
@@ -1185,7 +1185,7 @@ function createRouter(deps) {
|
|
|
1185
1185
|
return !1;
|
|
1186
1186
|
let firstToken = text.split(/\s+/, 1)[0].toLowerCase(), commandWord = firstToken.split("@")[0].slice(1), args = text.slice(firstToken.length).trim();
|
|
1187
1187
|
if (deps.remoteControls) {
|
|
1188
|
-
let { handleMobileCommand, cancelMobileTransfer } = await import("./mobile-commands-
|
|
1188
|
+
let { handleMobileCommand, cancelMobileTransfer } = await import("./mobile-commands-ICUXFW5V.js");
|
|
1189
1189
|
if (["stop", "stopall", "new", "cancel"].includes(commandWord) && cancelMobileTransfer(key), commandWord === "cancel")
|
|
1190
1190
|
return invalidateGatewayDialogs(key), await adapter.send(event.source.chatId, "Cancelled the pending selection or transfer.", {
|
|
1191
1191
|
threadId: event.source.threadId
|
|
@@ -7,6 +7,12 @@ import {
|
|
|
7
7
|
leaveGoalAuto
|
|
8
8
|
} from "./chunk-7N3YHTYF.js";
|
|
9
9
|
import "./chunk-OR4L3IB2.js";
|
|
10
|
+
import {
|
|
11
|
+
collectChildUsage,
|
|
12
|
+
collectUsageRequests,
|
|
13
|
+
totalChildUsage,
|
|
14
|
+
totalRequestUsage
|
|
15
|
+
} from "./chunk-SWWHZ2RI.js";
|
|
10
16
|
import {
|
|
11
17
|
getAgentDir
|
|
12
18
|
} from "./chunk-64XTQNLA.js";
|
|
@@ -24,7 +30,7 @@ function checkpointGoalActiveTime(goal2, now, continueClock) {
|
|
|
24
30
|
}
|
|
25
31
|
function updateGoalUsage(goal2, ctx, continueClock = goal2.status === "active") {
|
|
26
32
|
let now = Date.now(), baselineTokens = nonNegativeFiniteNumber(goal2.baselineTokens);
|
|
27
|
-
goal2.baselineTokens = baselineTokens, goal2.tokensUsed = Math.max(
|
|
33
|
+
goal2.baselineTokens = baselineTokens, goal2.tokensUsed = Math.max(nonNegativeFiniteNumber(goal2.tokensUsed), currentTokenTotal(ctx) - baselineTokens), checkpointGoalActiveTime(goal2, now, continueClock), goal2.updatedAt = now;
|
|
28
34
|
}
|
|
29
35
|
function formatDuration(seconds) {
|
|
30
36
|
let wholeSeconds = Math.max(0, Math.floor(nonNegativeFiniteNumber(seconds)));
|
|
@@ -63,8 +69,8 @@ function cumulativeAssistantTokens(entries) {
|
|
|
63
69
|
return total;
|
|
64
70
|
}
|
|
65
71
|
function currentTokenTotal(ctx) {
|
|
66
|
-
let sessionManager = ctx.sessionManager;
|
|
67
|
-
return
|
|
72
|
+
let sessionManager = ctx.sessionManager, entries = sessionManager?.getEntries?.() ?? sessionManager?.getBranch?.() ?? [];
|
|
73
|
+
return totalRequestUsage(collectUsageRequests(entries)).total + totalChildUsage(collectChildUsage(entries)).total;
|
|
68
74
|
}
|
|
69
75
|
|
|
70
76
|
// packages/coding-agent/dist/builtin-extensions/narumiruna-pi-goal/src/command.js
|
|
@@ -19,7 +19,7 @@ import {
|
|
|
19
19
|
TreeSelectorComponent,
|
|
20
20
|
UserMessageComponent,
|
|
21
21
|
UserMessageSelectorComponent
|
|
22
|
-
} from "./chunk-
|
|
22
|
+
} from "./chunk-QT3F6UEV.js";
|
|
23
23
|
import {
|
|
24
24
|
attachJsonlLineReader,
|
|
25
25
|
runRpcMode,
|
|
@@ -31,7 +31,7 @@ import {
|
|
|
31
31
|
import "./chunk-H6YBCWKG.js";
|
|
32
32
|
import "./chunk-U5F4IC7R.js";
|
|
33
33
|
import "./chunk-US544NN6.js";
|
|
34
|
-
import "./chunk-
|
|
34
|
+
import "./chunk-RY3FJ6WI.js";
|
|
35
35
|
import {
|
|
36
36
|
copyToClipboard
|
|
37
37
|
} from "./chunk-Q5ZU2VRT.js";
|
|
@@ -40,9 +40,9 @@ import "./chunk-QBTJG3UM.js";
|
|
|
40
40
|
import "./chunk-7N3YHTYF.js";
|
|
41
41
|
import {
|
|
42
42
|
main
|
|
43
|
-
} from "./chunk-
|
|
43
|
+
} from "./chunk-DFMPRAQQ.js";
|
|
44
44
|
import "./chunk-R4WSB2MQ.js";
|
|
45
|
-
import "./chunk-
|
|
45
|
+
import "./chunk-JEK35V2M.js";
|
|
46
46
|
import "./chunk-IHHTWSXN.js";
|
|
47
47
|
import "./chunk-YPHAIRZT.js";
|
|
48
48
|
import "./chunk-PL6JKXWI.js";
|
|
@@ -58,7 +58,7 @@ import {
|
|
|
58
58
|
parseSkillBlock,
|
|
59
59
|
wrapRegisteredTool,
|
|
60
60
|
wrapRegisteredTools
|
|
61
|
-
} from "./chunk-
|
|
61
|
+
} from "./chunk-BMRXLQWQ.js";
|
|
62
62
|
import {
|
|
63
63
|
DefaultResourceLoader,
|
|
64
64
|
createEventBus,
|
|
@@ -154,7 +154,7 @@ import {
|
|
|
154
154
|
resolveModelScopeWithDiagnostics,
|
|
155
155
|
serializeConversation,
|
|
156
156
|
shouldCompact
|
|
157
|
-
} from "./chunk-
|
|
157
|
+
} from "./chunk-ICKGAKWX.js";
|
|
158
158
|
import {
|
|
159
159
|
ExtensionRunner
|
|
160
160
|
} from "./chunk-BYC6RKCN.js";
|
|
@@ -179,7 +179,7 @@ import {
|
|
|
179
179
|
recordTuiActivity,
|
|
180
180
|
registerTransferHandler,
|
|
181
181
|
requestSessionTransfer
|
|
182
|
-
} from "./chunk-
|
|
182
|
+
} from "./chunk-STMX7W5I.js";
|
|
183
183
|
import {
|
|
184
184
|
CURRENT_SESSION_VERSION,
|
|
185
185
|
SessionManager,
|
|
@@ -189,7 +189,7 @@ import {
|
|
|
189
189
|
migrateSessionEntries,
|
|
190
190
|
parseSessionEntries,
|
|
191
191
|
sessionEntryToContextMessages
|
|
192
|
-
} from "./chunk-
|
|
192
|
+
} from "./chunk-PWHTSQC4.js";
|
|
193
193
|
import {
|
|
194
194
|
convertToLlm
|
|
195
195
|
} from "./chunk-FVDOXRUD.js";
|
|
@@ -222,6 +222,7 @@ import {
|
|
|
222
222
|
isToolCallEventType,
|
|
223
223
|
isWriteToolResult
|
|
224
224
|
} from "./chunk-OR4L3IB2.js";
|
|
225
|
+
import "./chunk-SWWHZ2RI.js";
|
|
225
226
|
import "./chunk-RHCGYWO7.js";
|
|
226
227
|
import {
|
|
227
228
|
parseArgs
|
|
@@ -2,17 +2,17 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
|
|
|
2
2
|
import {
|
|
3
3
|
InteractiveMode,
|
|
4
4
|
startInteractiveToolInstalls
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-QT3F6UEV.js";
|
|
6
6
|
import "./chunk-H6YBCWKG.js";
|
|
7
7
|
import "./chunk-US544NN6.js";
|
|
8
|
-
import "./chunk-
|
|
8
|
+
import "./chunk-RY3FJ6WI.js";
|
|
9
9
|
import "./chunk-Q5ZU2VRT.js";
|
|
10
10
|
import "./chunk-NUIFPZWX.js";
|
|
11
11
|
import "./chunk-QBTJG3UM.js";
|
|
12
12
|
import "./chunk-7N3YHTYF.js";
|
|
13
13
|
import "./chunk-YPHAIRZT.js";
|
|
14
14
|
import "./chunk-5ZH3ZFIZ.js";
|
|
15
|
-
import "./chunk-
|
|
15
|
+
import "./chunk-BMRXLQWQ.js";
|
|
16
16
|
import "./chunk-DQSCFU7R.js";
|
|
17
17
|
import "./chunk-CCCN2UCX.js";
|
|
18
18
|
import "./chunk-UYRKUKFE.js";
|
|
@@ -31,7 +31,7 @@ import "./chunk-4KNKQGHM.js";
|
|
|
31
31
|
import "./chunk-LHV3V67B.js";
|
|
32
32
|
import "./chunk-F2SMQ6ES.js";
|
|
33
33
|
import "./chunk-URD2SLIT.js";
|
|
34
|
-
import "./chunk-
|
|
34
|
+
import "./chunk-ICKGAKWX.js";
|
|
35
35
|
import "./chunk-BYC6RKCN.js";
|
|
36
36
|
import "./chunk-CGBXPL3E.js";
|
|
37
37
|
import "./chunk-BBUVIEZB.js";
|
|
@@ -41,8 +41,8 @@ import "./chunk-BDRGN3L2.js";
|
|
|
41
41
|
import "./chunk-FY4A63RK.js";
|
|
42
42
|
import "./chunk-RYRGL7P4.js";
|
|
43
43
|
import "./chunk-ES6PBSIE.js";
|
|
44
|
-
import "./chunk-
|
|
45
|
-
import "./chunk-
|
|
44
|
+
import "./chunk-STMX7W5I.js";
|
|
45
|
+
import "./chunk-PWHTSQC4.js";
|
|
46
46
|
import "./chunk-FVDOXRUD.js";
|
|
47
47
|
import "./chunk-4EULYYR4.js";
|
|
48
48
|
import "./chunk-UJOCPOMX.js";
|
|
@@ -56,6 +56,7 @@ import "./chunk-H2EOZYMP.js";
|
|
|
56
56
|
import "./chunk-FTKEZL27.js";
|
|
57
57
|
import "./chunk-PVCDKGR6.js";
|
|
58
58
|
import "./chunk-OR4L3IB2.js";
|
|
59
|
+
import "./chunk-SWWHZ2RI.js";
|
|
59
60
|
import "./chunk-RHCGYWO7.js";
|
|
60
61
|
import "./chunk-WPXUR3HE.js";
|
|
61
62
|
import "./chunk-CCZJ3PYY.js";
|
|
@@ -13,10 +13,10 @@ import {
|
|
|
13
13
|
setCronDeliverValidator,
|
|
14
14
|
startScheduler,
|
|
15
15
|
updateJob
|
|
16
|
-
} from "./chunk-
|
|
16
|
+
} from "./chunk-E5DQGNJI.js";
|
|
17
17
|
import {
|
|
18
18
|
resolveWithinRoots
|
|
19
|
-
} from "./chunk-
|
|
19
|
+
} from "./chunk-4QRUZ64T.js";
|
|
20
20
|
import "./chunk-NNNR3QIY.js";
|
|
21
21
|
import "./chunk-WXYNALHD.js";
|
|
22
22
|
import {
|
|
@@ -39,8 +39,8 @@ import "./chunk-BDRGN3L2.js";
|
|
|
39
39
|
import "./chunk-FY4A63RK.js";
|
|
40
40
|
import "./chunk-RYRGL7P4.js";
|
|
41
41
|
import "./chunk-ES6PBSIE.js";
|
|
42
|
-
import "./chunk-
|
|
43
|
-
import "./chunk-
|
|
42
|
+
import "./chunk-STMX7W5I.js";
|
|
43
|
+
import "./chunk-PWHTSQC4.js";
|
|
44
44
|
import "./chunk-FVDOXRUD.js";
|
|
45
45
|
import "./chunk-IMLCWLPI.js";
|
|
46
46
|
import "./chunk-MNQXDFPV.js";
|
|
@@ -2,14 +2,14 @@ import { createRequire as __lunrRequire } from "node:module"; const require = __
|
|
|
2
2
|
import {
|
|
3
3
|
main,
|
|
4
4
|
readPipedStdin
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-DFMPRAQQ.js";
|
|
6
6
|
import "./chunk-R4WSB2MQ.js";
|
|
7
|
-
import "./chunk-
|
|
7
|
+
import "./chunk-JEK35V2M.js";
|
|
8
8
|
import "./chunk-IHHTWSXN.js";
|
|
9
9
|
import "./chunk-YPHAIRZT.js";
|
|
10
10
|
import "./chunk-PL6JKXWI.js";
|
|
11
11
|
import "./chunk-5ZH3ZFIZ.js";
|
|
12
|
-
import "./chunk-
|
|
12
|
+
import "./chunk-BMRXLQWQ.js";
|
|
13
13
|
import "./chunk-DQSCFU7R.js";
|
|
14
14
|
import "./chunk-CCCN2UCX.js";
|
|
15
15
|
import "./chunk-UYRKUKFE.js";
|
|
@@ -29,7 +29,7 @@ import "./chunk-4KNKQGHM.js";
|
|
|
29
29
|
import "./chunk-LHV3V67B.js";
|
|
30
30
|
import "./chunk-F2SMQ6ES.js";
|
|
31
31
|
import "./chunk-URD2SLIT.js";
|
|
32
|
-
import "./chunk-
|
|
32
|
+
import "./chunk-ICKGAKWX.js";
|
|
33
33
|
import "./chunk-BYC6RKCN.js";
|
|
34
34
|
import "./chunk-CGBXPL3E.js";
|
|
35
35
|
import "./chunk-BBUVIEZB.js";
|
|
@@ -39,8 +39,8 @@ import "./chunk-BDRGN3L2.js";
|
|
|
39
39
|
import "./chunk-FY4A63RK.js";
|
|
40
40
|
import "./chunk-RYRGL7P4.js";
|
|
41
41
|
import "./chunk-ES6PBSIE.js";
|
|
42
|
-
import "./chunk-
|
|
43
|
-
import "./chunk-
|
|
42
|
+
import "./chunk-STMX7W5I.js";
|
|
43
|
+
import "./chunk-PWHTSQC4.js";
|
|
44
44
|
import "./chunk-FVDOXRUD.js";
|
|
45
45
|
import "./chunk-4EULYYR4.js";
|
|
46
46
|
import "./chunk-UJOCPOMX.js";
|
|
@@ -55,6 +55,7 @@ import "./chunk-H2EOZYMP.js";
|
|
|
55
55
|
import "./chunk-FTKEZL27.js";
|
|
56
56
|
import "./chunk-PVCDKGR6.js";
|
|
57
57
|
import "./chunk-OR4L3IB2.js";
|
|
58
|
+
import "./chunk-SWWHZ2RI.js";
|
|
58
59
|
import "./chunk-RHCGYWO7.js";
|
|
59
60
|
import "./chunk-WPXUR3HE.js";
|
|
60
61
|
import "./chunk-CCZJ3PYY.js";
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
createProjectFolder,
|
|
7
7
|
handleMobileCommand,
|
|
8
8
|
resolveWithinRoots
|
|
9
|
-
} from "./chunk-
|
|
9
|
+
} from "./chunk-4QRUZ64T.js";
|
|
10
10
|
import "./chunk-NNNR3QIY.js";
|
|
11
11
|
import "./chunk-WXYNALHD.js";
|
|
12
12
|
import "./chunk-BYC6RKCN.js";
|
|
@@ -15,7 +15,7 @@ import "./chunk-APVM5NEU.js";
|
|
|
15
15
|
import "./chunk-F2V2F4ZG.js";
|
|
16
16
|
import "./chunk-BDRGN3L2.js";
|
|
17
17
|
import "./chunk-FY4A63RK.js";
|
|
18
|
-
import "./chunk-
|
|
18
|
+
import "./chunk-PWHTSQC4.js";
|
|
19
19
|
import "./chunk-FVDOXRUD.js";
|
|
20
20
|
import "./chunk-MNQXDFPV.js";
|
|
21
21
|
import "./chunk-RHCGYWO7.js";
|
|
@@ -129,6 +129,11 @@ import "./chunk-FVDOXRUD.js";
|
|
|
129
129
|
import "./chunk-UJOCPOMX.js";
|
|
130
130
|
import "./chunk-IMLCWLPI.js";
|
|
131
131
|
import "./chunk-RQ2Q5IYR.js";
|
|
132
|
+
import {
|
|
133
|
+
collectChildUsage,
|
|
134
|
+
collectUsageRequests,
|
|
135
|
+
totalRequestUsage
|
|
136
|
+
} from "./chunk-SWWHZ2RI.js";
|
|
132
137
|
import "./chunk-RHCGYWO7.js";
|
|
133
138
|
import {
|
|
134
139
|
keyText
|
|
@@ -292,7 +297,7 @@ function usageTokenTotal(usage) {
|
|
|
292
297
|
function compactResultTokens(result2) {
|
|
293
298
|
let progress = result2.progress || result2.progressSummary;
|
|
294
299
|
if (progress && progress.tokens > 0)
|
|
295
|
-
return progress.tokens;
|
|
300
|
+
return Math.max(progress.tokens, usageTokenTotal(result2.usage));
|
|
296
301
|
let fromUsage = usageTokenTotal(result2.usage);
|
|
297
302
|
return fromUsage > 0 ? fromUsage : progress?.tokens ?? 0;
|
|
298
303
|
}
|
|
@@ -3255,49 +3260,10 @@ var SubagentsStopSelector = class {
|
|
|
3255
3260
|
}
|
|
3256
3261
|
};
|
|
3257
3262
|
function emptyUsage() {
|
|
3258
|
-
return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0 };
|
|
3263
|
+
return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0, cost: 0, turns: 0, unknownRequests: 0, partialRequests: 0, unknownCosts: 0 };
|
|
3259
3264
|
}
|
|
3260
3265
|
function addUsage(target, source) {
|
|
3261
|
-
target.input += source.input, target.output += source.output, target.cacheRead += source.cacheRead, target.cacheWrite += source.cacheWrite, target.cost += source.cost, target.turns += source.turns;
|
|
3262
|
-
}
|
|
3263
|
-
function usageHasValue(usage) {
|
|
3264
|
-
return usage.input !== 0 || usage.output !== 0 || usage.cacheRead !== 0 || usage.cacheWrite !== 0 || usage.cost !== 0 || usage.turns !== 0;
|
|
3265
|
-
}
|
|
3266
|
-
function assistantUsageFromMessage(message) {
|
|
3267
|
-
if (!message || typeof message != "object")
|
|
3268
|
-
return;
|
|
3269
|
-
let msg = message;
|
|
3270
|
-
if (msg.role !== "assistant" || !msg.usage || typeof msg.usage != "object")
|
|
3271
|
-
return;
|
|
3272
|
-
let usage = msg.usage;
|
|
3273
|
-
return {
|
|
3274
|
-
input: typeof usage.input == "number" ? usage.input : 0,
|
|
3275
|
-
output: typeof usage.output == "number" ? usage.output : 0,
|
|
3276
|
-
cacheRead: typeof usage.cacheRead == "number" ? usage.cacheRead : 0,
|
|
3277
|
-
cacheWrite: typeof usage.cacheWrite == "number" ? usage.cacheWrite : 0,
|
|
3278
|
-
cost: typeof usage.cost?.total == "number" ? usage.cost.total : 0,
|
|
3279
|
-
turns: 1
|
|
3280
|
-
};
|
|
3281
|
-
}
|
|
3282
|
-
function isSubagentDetails(value) {
|
|
3283
|
-
if (!value || typeof value != "object")
|
|
3284
|
-
return !1;
|
|
3285
|
-
let details = value;
|
|
3286
|
-
return typeof details.mode == "string" && Array.isArray(details.results);
|
|
3287
|
-
}
|
|
3288
|
-
function detailsFromSessionEntry(entry) {
|
|
3289
|
-
if (!entry || typeof entry != "object")
|
|
3290
|
-
return;
|
|
3291
|
-
let record = entry;
|
|
3292
|
-
if (record.type === "custom_message" && record.customType === SLASH_RESULT_TYPE) {
|
|
3293
|
-
let details = resolveSlashMessageDetails(record.details)?.result.details;
|
|
3294
|
-
return isSubagentDetails(details) ? details : void 0;
|
|
3295
|
-
}
|
|
3296
|
-
if (record.type !== "message" || !record.message || typeof record.message != "object")
|
|
3297
|
-
return;
|
|
3298
|
-
let message = record.message;
|
|
3299
|
-
if (!(message.role !== "toolResult" || message.toolName !== "subagent"))
|
|
3300
|
-
return isSubagentDetails(message.details) ? message.details : void 0;
|
|
3266
|
+
target.input += source.input, target.output += source.output, target.cacheRead += source.cacheRead, target.cacheWrite += source.cacheWrite, target.cost += source.cost, target.turns += source.turns, target.unknownRequests += source.unknownRequests ?? 0, target.partialRequests += source.partialRequests ?? 0, target.unknownCosts += source.unknownCosts ?? 0;
|
|
3301
3267
|
}
|
|
3302
3268
|
function formatCostUsage(label, usage) {
|
|
3303
3269
|
let extras = [
|
|
@@ -3305,26 +3271,13 @@ function formatCostUsage(label, usage) {
|
|
|
3305
3271
|
usage.cacheWrite ? `cache write ${formatTokens(usage.cacheWrite)}` : "",
|
|
3306
3272
|
usage.turns ? `${usage.turns} turn${usage.turns === 1 ? "" : "s"}` : ""
|
|
3307
3273
|
].filter(Boolean);
|
|
3308
|
-
return `${label}: \u2191${formatTokens(usage.input)} \u2193${formatTokens(usage.output)} $${usage.cost.toFixed(4)}${extras.length ? ` (${extras.join(", ")})` : ""}`;
|
|
3274
|
+
return `${label}: \u2191${formatTokens(usage.input + usage.cacheRead + usage.cacheWrite)} \u2193${formatTokens(usage.output)} $${usage.cost.toFixed(4)}${extras.length ? ` (${extras.join(", ")})` : ""}`;
|
|
3309
3275
|
}
|
|
3310
3276
|
function buildSubagentCostReport(ctx) {
|
|
3311
|
-
let parent = emptyUsage(), childTotal = emptyUsage(), total = emptyUsage(), children = [];
|
|
3312
|
-
|
|
3313
|
-
|
|
3314
|
-
|
|
3315
|
-
let details = detailsFromSessionEntry(entry);
|
|
3316
|
-
if (details)
|
|
3317
|
-
for (let result2 of details.results) {
|
|
3318
|
-
if (!usageHasValue(result2.usage))
|
|
3319
|
-
continue;
|
|
3320
|
-
let usage = { ...result2.usage };
|
|
3321
|
-
children.push({
|
|
3322
|
-
label: `Child ${children.length + 1} (${result2.agent})`,
|
|
3323
|
-
usage,
|
|
3324
|
-
...result2.sessionFile ? { sessionFile: result2.sessionFile } : {}
|
|
3325
|
-
}), addUsage(childTotal, usage);
|
|
3326
|
-
}
|
|
3327
|
-
}
|
|
3277
|
+
let parent = emptyUsage(), childTotal = emptyUsage(), total = emptyUsage(), children = [], entries = ctx.sessionManager.getEntries(), parentTotals = totalRequestUsage(collectUsageRequests(entries));
|
|
3278
|
+
Object.assign(parent, { ...parentTotals, turns: collectUsageRequests(entries).length });
|
|
3279
|
+
for (let child of collectChildUsage(entries))
|
|
3280
|
+
children.push({ label: `Child ${children.length + 1} (${child.label})`, usage: child, sessionFile: child.sessionFile }), addUsage(childTotal, child);
|
|
3328
3281
|
addUsage(total, parent), addUsage(total, childTotal);
|
|
3329
3282
|
let lines = [
|
|
3330
3283
|
"Subagent cost",
|
|
@@ -6204,7 +6157,8 @@ function sendCompletion(pi, details) {
|
|
|
6204
6157
|
pi.sendMessage({
|
|
6205
6158
|
customType: "subagent-notify",
|
|
6206
6159
|
content,
|
|
6207
|
-
display: !0
|
|
6160
|
+
display: !0,
|
|
6161
|
+
details: { children: details.flatMap((detail) => detail.children ?? []) }
|
|
6208
6162
|
}, { triggerTurn: details.some((detail) => detail.status !== "stopped") });
|
|
6209
6163
|
}
|
|
6210
6164
|
function completionBatchKey(result2) {
|
|
@@ -6219,6 +6173,7 @@ function buildCompletionDetails(result2) {
|
|
|
6219
6173
|
return {
|
|
6220
6174
|
agent,
|
|
6221
6175
|
status,
|
|
6176
|
+
children: result2.results?.map((child, index) => ({ ...child, childId: child.childId ?? `${result2.id}:${index}` })),
|
|
6222
6177
|
...result2.source ? { source: result2.source } : {},
|
|
6223
6178
|
...taskInfo ? { taskInfo } : {},
|
|
6224
6179
|
resultPreview: [
|
|
@@ -6692,7 +6647,7 @@ function registerSubagentExtension(pi) {
|
|
|
6692
6647
|
try {
|
|
6693
6648
|
let currentGeneration = generation;
|
|
6694
6649
|
if (signal?.throwIfAborted(), !executorPromise) {
|
|
6695
|
-
let pending = import("./subagent-executor-
|
|
6650
|
+
let pending = import("./subagent-executor-UI6SHG3X.js").then(({ createSubagentExecutor }) => {
|
|
6696
6651
|
if (generation !== currentGeneration)
|
|
6697
6652
|
throw new Error("Subagent session changed before initialization");
|
|
6698
6653
|
return createSubagentExecutor({
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
import { createRequire as __lunrRequire } from "node:module"; const require = __lunrRequire(import.meta.url);
|
|
3
3
|
import {
|
|
4
4
|
main
|
|
5
|
-
} from "./chunk-
|
|
5
|
+
} from "./chunk-DFMPRAQQ.js";
|
|
6
6
|
import "./chunk-R4WSB2MQ.js";
|
|
7
|
-
import "./chunk-
|
|
7
|
+
import "./chunk-JEK35V2M.js";
|
|
8
8
|
import "./chunk-IHHTWSXN.js";
|
|
9
9
|
import "./chunk-YPHAIRZT.js";
|
|
10
10
|
import "./chunk-PL6JKXWI.js";
|
|
11
11
|
import "./chunk-5ZH3ZFIZ.js";
|
|
12
|
-
import "./chunk-
|
|
12
|
+
import "./chunk-BMRXLQWQ.js";
|
|
13
13
|
import "./chunk-DQSCFU7R.js";
|
|
14
14
|
import "./chunk-CCCN2UCX.js";
|
|
15
15
|
import "./chunk-UYRKUKFE.js";
|
|
@@ -31,7 +31,7 @@ import "./chunk-4KNKQGHM.js";
|
|
|
31
31
|
import "./chunk-LHV3V67B.js";
|
|
32
32
|
import "./chunk-F2SMQ6ES.js";
|
|
33
33
|
import "./chunk-URD2SLIT.js";
|
|
34
|
-
import "./chunk-
|
|
34
|
+
import "./chunk-ICKGAKWX.js";
|
|
35
35
|
import "./chunk-BYC6RKCN.js";
|
|
36
36
|
import "./chunk-CGBXPL3E.js";
|
|
37
37
|
import "./chunk-BBUVIEZB.js";
|
|
@@ -41,8 +41,8 @@ import "./chunk-BDRGN3L2.js";
|
|
|
41
41
|
import "./chunk-FY4A63RK.js";
|
|
42
42
|
import "./chunk-RYRGL7P4.js";
|
|
43
43
|
import "./chunk-ES6PBSIE.js";
|
|
44
|
-
import "./chunk-
|
|
45
|
-
import "./chunk-
|
|
44
|
+
import "./chunk-STMX7W5I.js";
|
|
45
|
+
import "./chunk-PWHTSQC4.js";
|
|
46
46
|
import "./chunk-FVDOXRUD.js";
|
|
47
47
|
import "./chunk-4EULYYR4.js";
|
|
48
48
|
import "./chunk-UJOCPOMX.js";
|
|
@@ -57,6 +57,7 @@ import "./chunk-H2EOZYMP.js";
|
|
|
57
57
|
import "./chunk-FTKEZL27.js";
|
|
58
58
|
import "./chunk-PVCDKGR6.js";
|
|
59
59
|
import "./chunk-OR4L3IB2.js";
|
|
60
|
+
import "./chunk-SWWHZ2RI.js";
|
|
60
61
|
import "./chunk-RHCGYWO7.js";
|
|
61
62
|
import "./chunk-WPXUR3HE.js";
|
|
62
63
|
import "./chunk-CCZJ3PYY.js";
|
|
@@ -11,8 +11,8 @@ import {
|
|
|
11
11
|
recordTuiActivity,
|
|
12
12
|
registerTransferHandler,
|
|
13
13
|
requestSessionTransfer
|
|
14
|
-
} from "./chunk-
|
|
15
|
-
import "./chunk-
|
|
14
|
+
} from "./chunk-STMX7W5I.js";
|
|
15
|
+
import "./chunk-PWHTSQC4.js";
|
|
16
16
|
import "./chunk-FVDOXRUD.js";
|
|
17
17
|
import "./chunk-MNQXDFPV.js";
|
|
18
18
|
import "./chunk-64XTQNLA.js";
|