@staff0rd/assist 0.1016.2 → 0.1017.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/commands/sessions/web/bundle.js +436 -436
- package/dist/index.js +127 -4
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { Command } from "commander";
|
|
|
6
6
|
// package.json
|
|
7
7
|
var package_default = {
|
|
8
8
|
name: "@staff0rd/assist",
|
|
9
|
-
version: "0.
|
|
9
|
+
version: "0.1017.0",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -47952,9 +47952,11 @@ function toSessionViewInfo({
|
|
|
47952
47952
|
cols,
|
|
47953
47953
|
rows,
|
|
47954
47954
|
activeViewer,
|
|
47955
|
-
activeViewerNode
|
|
47955
|
+
activeViewerNode,
|
|
47956
|
+
transfer
|
|
47956
47957
|
}) {
|
|
47957
47958
|
return {
|
|
47959
|
+
transfer,
|
|
47958
47960
|
lastUserMessage,
|
|
47959
47961
|
lastAssistantMessage,
|
|
47960
47962
|
cols,
|
|
@@ -51656,7 +51658,7 @@ function killedByDaemonRestart(interrupted) {
|
|
|
51656
51658
|
|
|
51657
51659
|
// src/commands/sessions/daemon/shouldAutoDismiss.ts
|
|
51658
51660
|
function shouldAutoDismiss(session, exitCode) {
|
|
51659
|
-
if (session.status !== "done" || exitCode !== 0) {
|
|
51661
|
+
if (session.status !== "done" || exitCode !== 0 || session.transfer) {
|
|
51660
51662
|
return false;
|
|
51661
51663
|
}
|
|
51662
51664
|
if (session.reviewStarted) return true;
|
|
@@ -53584,7 +53586,7 @@ function forwardLinkCreate(ctx, client, data) {
|
|
|
53584
53586
|
});
|
|
53585
53587
|
return;
|
|
53586
53588
|
}
|
|
53587
|
-
const traceId = newTraceId();
|
|
53589
|
+
const traceId = typeof data.traceId === "string" ? data.traceId : newTraceId();
|
|
53588
53590
|
daemonLog(
|
|
53589
53591
|
`link ${node} ws: routing ${data.type} (cwd=${data.cwd ?? "default"}) trace=${traceId}`
|
|
53590
53592
|
);
|
|
@@ -54041,6 +54043,7 @@ var NodeLinks = class {
|
|
|
54041
54043
|
local: this.localNode(),
|
|
54042
54044
|
links: this.all().map((link3) => link3.status())
|
|
54043
54045
|
});
|
|
54046
|
+
isConnected = (node) => this.links.get(node)?.status().state === "connected";
|
|
54044
54047
|
sendNodes = (client) => sendTo(client, this.nodes());
|
|
54045
54048
|
route(client, data) {
|
|
54046
54049
|
if (this.clients.isPeer(client)) return false;
|
|
@@ -54404,6 +54407,7 @@ var SessionManager = class {
|
|
|
54404
54407
|
);
|
|
54405
54408
|
}
|
|
54406
54409
|
hasSession = (id) => this.sessions.has(id);
|
|
54410
|
+
session = (id) => this.sessions.get(id);
|
|
54407
54411
|
localSessions = () => [...this.sessions.values()].map(toSessionInfo);
|
|
54408
54412
|
listSessions = () => this.localSessions().concat(this.links.sessions());
|
|
54409
54413
|
notify = () => {
|
|
@@ -55459,6 +55463,124 @@ function spawnCreate(m, d) {
|
|
|
55459
55463
|
);
|
|
55460
55464
|
}
|
|
55461
55465
|
|
|
55466
|
+
// src/commands/sessions/shared/backlogRunArgs.ts
|
|
55467
|
+
function backlogRunArgs(session) {
|
|
55468
|
+
const args = session.assistArgs;
|
|
55469
|
+
if (session.commandType !== "assist" || !args) return void 0;
|
|
55470
|
+
if (args[0] !== "backlog" || args[1] !== "run" || !args[2]) return void 0;
|
|
55471
|
+
return args;
|
|
55472
|
+
}
|
|
55473
|
+
|
|
55474
|
+
// src/commands/sessions/daemon/transfer/launchOnTarget.ts
|
|
55475
|
+
function launchOnTarget(route, request) {
|
|
55476
|
+
return new Promise((resolve32) => {
|
|
55477
|
+
const capture = {
|
|
55478
|
+
send: (raw) => {
|
|
55479
|
+
const msg = JSON.parse(raw);
|
|
55480
|
+
if (msg.type === "created")
|
|
55481
|
+
resolve32({ ok: true, sessionId: msg.sessionId });
|
|
55482
|
+
else if (msg.type === "error")
|
|
55483
|
+
resolve32({ ok: false, error: String(msg.message) });
|
|
55484
|
+
}
|
|
55485
|
+
};
|
|
55486
|
+
if (!route(capture, request))
|
|
55487
|
+
resolve32({ ok: false, error: `${request.node} is not a linked node` });
|
|
55488
|
+
});
|
|
55489
|
+
}
|
|
55490
|
+
|
|
55491
|
+
// src/commands/sessions/daemon/transfer/settleTransfer.ts
|
|
55492
|
+
function settleTransfer(client, deps2, s, outcome, traceId) {
|
|
55493
|
+
const target = s.transfer?.target ?? "target";
|
|
55494
|
+
if (!outcome.ok) {
|
|
55495
|
+
daemonLog(
|
|
55496
|
+
`session ${s.id} transfer to ${target} failed trace=${traceId}: ${outcome.error}; source kept`
|
|
55497
|
+
);
|
|
55498
|
+
s.transfer = { target, error: outcome.error };
|
|
55499
|
+
deps2.notify();
|
|
55500
|
+
sendTo(client, {
|
|
55501
|
+
type: "error",
|
|
55502
|
+
message: `Transfer to ${target} failed: ${outcome.error}`
|
|
55503
|
+
});
|
|
55504
|
+
return;
|
|
55505
|
+
}
|
|
55506
|
+
daemonLog(
|
|
55507
|
+
`session ${s.id} transferred to ${target} as ${outcome.sessionId} trace=${traceId}; closing source`
|
|
55508
|
+
);
|
|
55509
|
+
s.transfer = void 0;
|
|
55510
|
+
deps2.dismiss(s.id);
|
|
55511
|
+
sendTo(client, { type: "notice", message: `Transferred to ${target}` });
|
|
55512
|
+
}
|
|
55513
|
+
|
|
55514
|
+
// src/commands/sessions/daemon/transfer/transferRefusal.ts
|
|
55515
|
+
function transferRefusal(s, target, links2) {
|
|
55516
|
+
if (!s) return "unknown session";
|
|
55517
|
+
if (!backlogRunArgs(s)) return "only backlog run sessions can be transferred";
|
|
55518
|
+
if (s.transfer && !s.transfer.error)
|
|
55519
|
+
return `already transferring to ${s.transfer.target}`;
|
|
55520
|
+
if (!target || target === links2.localNode())
|
|
55521
|
+
return `the session already runs on ${links2.localNode()}`;
|
|
55522
|
+
if (!links2.isConnected(target)) return `${target} is not connected`;
|
|
55523
|
+
return void 0;
|
|
55524
|
+
}
|
|
55525
|
+
async function heldWorkRefusal(s) {
|
|
55526
|
+
const path109 = s.worktree?.path ?? s.cwd;
|
|
55527
|
+
if (!path109) return void 0;
|
|
55528
|
+
const durability = await checkDurability(path109);
|
|
55529
|
+
if (durability.durable) return void 0;
|
|
55530
|
+
const held = await describeHeldWork(path109, durability.reason);
|
|
55531
|
+
return `${held.summary} in ${path109} \u2014 commit and push before transferring`;
|
|
55532
|
+
}
|
|
55533
|
+
|
|
55534
|
+
// src/commands/sessions/daemon/transfer/transferSession.ts
|
|
55535
|
+
function refuse(client, id, message3) {
|
|
55536
|
+
daemonLog(`session ${id} transfer refused: ${message3}`);
|
|
55537
|
+
sendTo(client, { type: "error", message: `Transfer refused: ${message3}` });
|
|
55538
|
+
}
|
|
55539
|
+
async function transferSession(client, deps2, { sessionId: id, target, cwd }) {
|
|
55540
|
+
const s = deps2.session(id);
|
|
55541
|
+
const refused = transferRefusal(s, target, deps2.links);
|
|
55542
|
+
if (refused || !s) return refuse(client, id, refused ?? "unknown session");
|
|
55543
|
+
const held = await heldWorkRefusal(s);
|
|
55544
|
+
if (held) return refuse(client, id, held);
|
|
55545
|
+
const traceId = newTraceId();
|
|
55546
|
+
daemonLog(
|
|
55547
|
+
`session ${id} transfer to ${target} (cwd=${cwd ?? "default"}) trace=${traceId}: stopping source`
|
|
55548
|
+
);
|
|
55549
|
+
s.transfer = { target };
|
|
55550
|
+
deps2.stop(id);
|
|
55551
|
+
deps2.notify();
|
|
55552
|
+
const outcome = await launchOnTarget(deps2.links.route, {
|
|
55553
|
+
type: "create-assist",
|
|
55554
|
+
assistArgs: backlogRunArgs(s),
|
|
55555
|
+
cwd,
|
|
55556
|
+
node: target,
|
|
55557
|
+
title: s.title,
|
|
55558
|
+
subtitle: s.subtitle,
|
|
55559
|
+
traceId
|
|
55560
|
+
});
|
|
55561
|
+
settleTransfer(client, deps2, s, outcome, traceId);
|
|
55562
|
+
}
|
|
55563
|
+
|
|
55564
|
+
// src/commands/sessions/daemon/transfer/handleTransfer.ts
|
|
55565
|
+
var handleTransfer = routed((client, m, d) => {
|
|
55566
|
+
daemonLog(`transfer received: id=${d.sessionId} target=${d.target}`);
|
|
55567
|
+
void transferSession(
|
|
55568
|
+
client,
|
|
55569
|
+
{
|
|
55570
|
+
session: m.session,
|
|
55571
|
+
links: m.links,
|
|
55572
|
+
stop: (id) => m.stopSession(id),
|
|
55573
|
+
dismiss: m.dismissSession,
|
|
55574
|
+
notify: () => m.update(() => true)
|
|
55575
|
+
},
|
|
55576
|
+
{
|
|
55577
|
+
sessionId: d.sessionId,
|
|
55578
|
+
target: d.target,
|
|
55579
|
+
cwd: d.cwd
|
|
55580
|
+
}
|
|
55581
|
+
);
|
|
55582
|
+
});
|
|
55583
|
+
|
|
55462
55584
|
// src/commands/sessions/daemon/messageHandlers.ts
|
|
55463
55585
|
var messageHandlers = {
|
|
55464
55586
|
ping: (client) => sendTo(client, { type: "pong", pid: process.pid }),
|
|
@@ -55517,6 +55639,7 @@ var messageHandlers = {
|
|
|
55517
55639
|
dismiss: routed((_client, m, d) => m.dismissSession(d.sessionId)),
|
|
55518
55640
|
discard: routed((_client, m, d) => m.discardSession(d.sessionId)),
|
|
55519
55641
|
stop: routed((_client, m, d) => m.stopSession(d.sessionId)),
|
|
55642
|
+
transfer: handleTransfer,
|
|
55520
55643
|
...sessionSettingHandlers,
|
|
55521
55644
|
"set-active": (_client, m, d) => m.active.set(d.cwd, d.sessionId),
|
|
55522
55645
|
"set-status": handleSetStatus,
|