@staff0rd/assist 0.971.0 → 0.972.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 +1 -1
- package/dist/index.js +206 -138
- 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.972.0",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -369,9 +369,9 @@ var daemonPaths = {
|
|
|
369
369
|
|
|
370
370
|
// src/commands/sessions/daemon/connectToDaemon.ts
|
|
371
371
|
function connectToDaemon() {
|
|
372
|
-
return new Promise((
|
|
372
|
+
return new Promise((resolve32, reject) => {
|
|
373
373
|
const socket = net.connect(daemonPaths.socket);
|
|
374
|
-
socket.once("connect", () =>
|
|
374
|
+
socket.once("connect", () => resolve32(socket));
|
|
375
375
|
socket.once("error", reject);
|
|
376
376
|
});
|
|
377
377
|
}
|
|
@@ -452,7 +452,7 @@ function spawnDaemon(reason4) {
|
|
|
452
452
|
child.unref();
|
|
453
453
|
}
|
|
454
454
|
function delay(ms) {
|
|
455
|
-
return new Promise((
|
|
455
|
+
return new Promise((resolve32) => setTimeout(resolve32, ms));
|
|
456
456
|
}
|
|
457
457
|
|
|
458
458
|
// src/shared/loadConfig.ts
|
|
@@ -1630,7 +1630,7 @@ var defaultDeps = {
|
|
|
1630
1630
|
serve: async (args) => {
|
|
1631
1631
|
await runTailscale(args);
|
|
1632
1632
|
},
|
|
1633
|
-
sleep: (ms) => new Promise((
|
|
1633
|
+
sleep: (ms) => new Promise((resolve32) => setTimeout(resolve32, ms)),
|
|
1634
1634
|
httpsPort: tailnetHttpsPort
|
|
1635
1635
|
};
|
|
1636
1636
|
async function ensureTailscaleServe(port, deps2 = {}) {
|
|
@@ -1665,11 +1665,11 @@ function createLinkWaiters() {
|
|
|
1665
1665
|
const waiters = /* @__PURE__ */ new Set();
|
|
1666
1666
|
return {
|
|
1667
1667
|
wait(timeoutMs, onTimeout) {
|
|
1668
|
-
return new Promise((
|
|
1668
|
+
return new Promise((resolve32, reject) => {
|
|
1669
1669
|
const onLink = (link3) => {
|
|
1670
1670
|
clearTimeout(timer);
|
|
1671
1671
|
waiters.delete(onLink);
|
|
1672
|
-
|
|
1672
|
+
resolve32(link3);
|
|
1673
1673
|
};
|
|
1674
1674
|
const timer = setTimeout(() => {
|
|
1675
1675
|
waiters.delete(onLink);
|
|
@@ -1732,7 +1732,7 @@ function createPendingReplies() {
|
|
|
1732
1732
|
return {
|
|
1733
1733
|
send(ws, timeoutMs, write) {
|
|
1734
1734
|
const id = randomUUID();
|
|
1735
|
-
return new Promise((
|
|
1735
|
+
return new Promise((resolve32, reject) => {
|
|
1736
1736
|
const timer = setTimeout(() => {
|
|
1737
1737
|
pending.delete(id);
|
|
1738
1738
|
reject(
|
|
@@ -1742,7 +1742,7 @@ function createPendingReplies() {
|
|
|
1742
1742
|
)
|
|
1743
1743
|
);
|
|
1744
1744
|
}, timeoutMs);
|
|
1745
|
-
pending.set(id, { ws, timer, resolve:
|
|
1745
|
+
pending.set(id, { ws, timer, resolve: resolve32, reject });
|
|
1746
1746
|
write(id);
|
|
1747
1747
|
});
|
|
1748
1748
|
},
|
|
@@ -4093,12 +4093,12 @@ async function loadVisibleItems(req) {
|
|
|
4093
4093
|
|
|
4094
4094
|
// src/commands/backlog/web/parseStatusBody.ts
|
|
4095
4095
|
function readBody(req) {
|
|
4096
|
-
return new Promise((
|
|
4096
|
+
return new Promise((resolve32, reject) => {
|
|
4097
4097
|
let body = "";
|
|
4098
4098
|
req.on("data", (chunk) => {
|
|
4099
4099
|
body += chunk.toString();
|
|
4100
4100
|
});
|
|
4101
|
-
req.on("end", () =>
|
|
4101
|
+
req.on("end", () => resolve32(body));
|
|
4102
4102
|
req.on("error", reject);
|
|
4103
4103
|
});
|
|
4104
4104
|
}
|
|
@@ -4630,11 +4630,11 @@ async function requestDaemonReply(request, replyType, timeoutMs = QUERY_TIMEOUT_
|
|
|
4630
4630
|
} catch {
|
|
4631
4631
|
return void 0;
|
|
4632
4632
|
}
|
|
4633
|
-
return new Promise((
|
|
4633
|
+
return new Promise((resolve32) => {
|
|
4634
4634
|
const finish2 = (result) => {
|
|
4635
4635
|
clearTimeout(timer);
|
|
4636
4636
|
socket.destroy();
|
|
4637
|
-
|
|
4637
|
+
resolve32(result);
|
|
4638
4638
|
};
|
|
4639
4639
|
const timer = setTimeout(() => finish2(void 0), timeoutMs);
|
|
4640
4640
|
const lines2 = createInterface2({ input: socket });
|
|
@@ -4829,7 +4829,7 @@ function parseIncoming(line, type) {
|
|
|
4829
4829
|
}
|
|
4830
4830
|
}
|
|
4831
4831
|
function requestSession(message3) {
|
|
4832
|
-
return new Promise((
|
|
4832
|
+
return new Promise((resolve32, reject) => {
|
|
4833
4833
|
connectToDaemon().then((socket) => {
|
|
4834
4834
|
let settled = false;
|
|
4835
4835
|
const finish2 = (error, sessionId) => {
|
|
@@ -4837,7 +4837,7 @@ function requestSession(message3) {
|
|
|
4837
4837
|
settled = true;
|
|
4838
4838
|
socket.destroy();
|
|
4839
4839
|
if (error) reject(error);
|
|
4840
|
-
else
|
|
4840
|
+
else resolve32(sessionId);
|
|
4841
4841
|
};
|
|
4842
4842
|
readSocketLines(socket, (line) => {
|
|
4843
4843
|
const incoming = parseIncoming(line, message3.type);
|
|
@@ -8164,7 +8164,7 @@ function forwardToPeer(req, res, node, url) {
|
|
|
8164
8164
|
const label = `link ${node} http: ${req.method} ${url.pathname} trace=${traceId}`;
|
|
8165
8165
|
const log2 = (outcome) => console.log(`${label} -> ${outcome} (${Date.now() - started}ms)`);
|
|
8166
8166
|
const send = url.protocol === "https:" ? httpsRequest : httpRequest;
|
|
8167
|
-
return new Promise((
|
|
8167
|
+
return new Promise((resolve32) => {
|
|
8168
8168
|
const upstream = send(
|
|
8169
8169
|
url,
|
|
8170
8170
|
{
|
|
@@ -8176,7 +8176,7 @@ function forwardToPeer(req, res, node, url) {
|
|
|
8176
8176
|
[TRACE_HEADER]: traceId
|
|
8177
8177
|
}
|
|
8178
8178
|
},
|
|
8179
|
-
(peer) => relayPeerResponse(peer, res, url.pathname, log2,
|
|
8179
|
+
(peer) => relayPeerResponse(peer, res, url.pathname, log2, resolve32)
|
|
8180
8180
|
);
|
|
8181
8181
|
boundUpstream(upstream, res, peerTimeoutFor(url.pathname));
|
|
8182
8182
|
upstream.on("error", (error) => {
|
|
@@ -8186,7 +8186,7 @@ function forwardToPeer(req, res, node, url) {
|
|
|
8186
8186
|
respondJson(res, 502, {
|
|
8187
8187
|
error: `${node} unreachable: ${error.message}`
|
|
8188
8188
|
});
|
|
8189
|
-
|
|
8189
|
+
resolve32();
|
|
8190
8190
|
});
|
|
8191
8191
|
req.pipe(upstream);
|
|
8192
8192
|
});
|
|
@@ -10557,17 +10557,17 @@ async function stopDaemon() {
|
|
|
10557
10557
|
}
|
|
10558
10558
|
}
|
|
10559
10559
|
function closedBeforeTimeout(socket) {
|
|
10560
|
-
return new Promise((
|
|
10560
|
+
return new Promise((resolve32) => {
|
|
10561
10561
|
const timer = setTimeout(() => {
|
|
10562
10562
|
socket.destroy();
|
|
10563
|
-
|
|
10563
|
+
resolve32(false);
|
|
10564
10564
|
}, STOP_TIMEOUT_MS);
|
|
10565
10565
|
socket.resume();
|
|
10566
10566
|
socket.on("error", () => {
|
|
10567
10567
|
});
|
|
10568
10568
|
socket.once("close", () => {
|
|
10569
10569
|
clearTimeout(timer);
|
|
10570
|
-
|
|
10570
|
+
resolve32(true);
|
|
10571
10571
|
});
|
|
10572
10572
|
});
|
|
10573
10573
|
}
|
|
@@ -10625,8 +10625,8 @@ async function restartWeb(req, res, deps2 = {}) {
|
|
|
10625
10625
|
return;
|
|
10626
10626
|
}
|
|
10627
10627
|
console.log(`restart ${target} ${linkedRequester(req)}`);
|
|
10628
|
-
await new Promise((
|
|
10629
|
-
res.once("finish",
|
|
10628
|
+
await new Promise((resolve32) => {
|
|
10629
|
+
res.once("finish", resolve32);
|
|
10630
10630
|
respondJson(res, 200, { ok: true });
|
|
10631
10631
|
});
|
|
10632
10632
|
try {
|
|
@@ -10817,8 +10817,8 @@ async function selfUpdate(req, res, deps2 = {}) {
|
|
|
10817
10817
|
return;
|
|
10818
10818
|
}
|
|
10819
10819
|
console.log("self-update: updated; restarting daemon and web server");
|
|
10820
|
-
await new Promise((
|
|
10821
|
-
res.once("finish",
|
|
10820
|
+
await new Promise((resolve32) => {
|
|
10821
|
+
res.once("finish", resolve32);
|
|
10822
10822
|
respondJson(res, 200, { ok: true });
|
|
10823
10823
|
});
|
|
10824
10824
|
await performRestart("both", restartDeps);
|
|
@@ -10913,14 +10913,14 @@ function linkWebSocketUrl(url) {
|
|
|
10913
10913
|
return target.toString();
|
|
10914
10914
|
}
|
|
10915
10915
|
function connectLinkWebSocket(url, handlers) {
|
|
10916
|
-
return new Promise((
|
|
10916
|
+
return new Promise((resolve32, reject) => {
|
|
10917
10917
|
const ws = new WebSocket(linkWebSocketUrl(url), {
|
|
10918
10918
|
handshakeTimeout: HANDSHAKE_TIMEOUT_MS
|
|
10919
10919
|
});
|
|
10920
10920
|
let open = false;
|
|
10921
10921
|
ws.on("open", () => {
|
|
10922
10922
|
open = true;
|
|
10923
|
-
|
|
10923
|
+
resolve32({
|
|
10924
10924
|
send: (line) => {
|
|
10925
10925
|
if (ws.readyState !== WebSocket.OPEN) return false;
|
|
10926
10926
|
ws.send(line);
|
|
@@ -10946,8 +10946,8 @@ var HELLO_TIMEOUT_MS = 5e3;
|
|
|
10946
10946
|
async function probePeerHello(url) {
|
|
10947
10947
|
let settle = () => {
|
|
10948
10948
|
};
|
|
10949
|
-
const reply2 = new Promise((
|
|
10950
|
-
settle =
|
|
10949
|
+
const reply2 = new Promise((resolve32) => {
|
|
10950
|
+
settle = resolve32;
|
|
10951
10951
|
});
|
|
10952
10952
|
const socket = await connectLinkWebSocket(url, {
|
|
10953
10953
|
onLine: (line) => {
|
|
@@ -12838,10 +12838,10 @@ function gitInvocation(cwd, args) {
|
|
|
12838
12838
|
}
|
|
12839
12839
|
function git2(cwd, args, timeout) {
|
|
12840
12840
|
const { file, argv, options: options2 } = gitInvocation(cwd, args);
|
|
12841
|
-
return new Promise((
|
|
12841
|
+
return new Promise((resolve32, reject) => {
|
|
12842
12842
|
execFile10(file, argv, { ...options2, timeout }, (error, stdout) => {
|
|
12843
12843
|
if (error) reject(error);
|
|
12844
|
-
else
|
|
12844
|
+
else resolve32(stdout.toString());
|
|
12845
12845
|
});
|
|
12846
12846
|
});
|
|
12847
12847
|
}
|
|
@@ -14191,7 +14191,7 @@ ${failed3.length} script(s) failed:`);
|
|
|
14191
14191
|
}
|
|
14192
14192
|
}
|
|
14193
14193
|
function runEntry(entry) {
|
|
14194
|
-
return new Promise((
|
|
14194
|
+
return new Promise((resolve32) => {
|
|
14195
14195
|
const startTime = Date.now();
|
|
14196
14196
|
const child = spawnCommand(
|
|
14197
14197
|
entry.fullCommand,
|
|
@@ -14203,7 +14203,7 @@ function runEntry(entry) {
|
|
|
14203
14203
|
child.on("close", (code) => {
|
|
14204
14204
|
const exitCode = code ?? 1;
|
|
14205
14205
|
flushIfFailed(exitCode, chunks);
|
|
14206
|
-
|
|
14206
|
+
resolve32({
|
|
14207
14207
|
script: entry.name,
|
|
14208
14208
|
code: exitCode,
|
|
14209
14209
|
durationMs: Date.now() - startTime
|
|
@@ -15099,7 +15099,7 @@ function parsePreviewDecision(line, requestId) {
|
|
|
15099
15099
|
|
|
15100
15100
|
// src/commands/sessions/shared/requestPreviewDecision.ts
|
|
15101
15101
|
function requestPreviewDecision(request) {
|
|
15102
|
-
return new Promise((
|
|
15102
|
+
return new Promise((resolve32, reject) => {
|
|
15103
15103
|
connectToDaemon().then((socket) => {
|
|
15104
15104
|
let settled = false;
|
|
15105
15105
|
const finish2 = (error, outcome) => {
|
|
@@ -15107,7 +15107,7 @@ function requestPreviewDecision(request) {
|
|
|
15107
15107
|
settled = true;
|
|
15108
15108
|
socket.destroy();
|
|
15109
15109
|
if (error) reject(error);
|
|
15110
|
-
else
|
|
15110
|
+
else resolve32(outcome);
|
|
15111
15111
|
};
|
|
15112
15112
|
readSocketLines(socket, (line) => {
|
|
15113
15113
|
const incoming = parsePreviewDecision(line, request.requestId);
|
|
@@ -17895,8 +17895,8 @@ function spawnInherit(command, args, options2 = {}) {
|
|
|
17895
17895
|
env: { ...env, ...options2.env },
|
|
17896
17896
|
cwd: options2.cwd
|
|
17897
17897
|
});
|
|
17898
|
-
const done2 = new Promise((
|
|
17899
|
-
child.on("close", (code) =>
|
|
17898
|
+
const done2 = new Promise((resolve32, reject) => {
|
|
17899
|
+
child.on("close", (code) => resolve32(code ?? 0));
|
|
17900
17900
|
child.on("error", reject);
|
|
17901
17901
|
});
|
|
17902
17902
|
return { child, done: done2 };
|
|
@@ -18021,7 +18021,7 @@ import chalk77 from "chalk";
|
|
|
18021
18021
|
// src/commands/sessions/daemon/sendToDaemonAwaitAck.ts
|
|
18022
18022
|
var ACK_TIMEOUT_MS = 1e3;
|
|
18023
18023
|
function sendToDaemonAwaitAck(message3) {
|
|
18024
|
-
return new Promise((
|
|
18024
|
+
return new Promise((resolve32, reject) => {
|
|
18025
18025
|
connectToDaemon().then((socket) => {
|
|
18026
18026
|
let settled = false;
|
|
18027
18027
|
const finish2 = (error) => {
|
|
@@ -18030,7 +18030,7 @@ function sendToDaemonAwaitAck(message3) {
|
|
|
18030
18030
|
clearTimeout(timer);
|
|
18031
18031
|
socket.destroy();
|
|
18032
18032
|
if (error) reject(error);
|
|
18033
|
-
else
|
|
18033
|
+
else resolve32();
|
|
18034
18034
|
};
|
|
18035
18035
|
const timer = setTimeout(
|
|
18036
18036
|
() => finish2(new Error("timed out awaiting daemon ack")),
|
|
@@ -18111,7 +18111,7 @@ async function deliver(sessionId, status2, payload, attempts) {
|
|
|
18111
18111
|
}
|
|
18112
18112
|
}
|
|
18113
18113
|
function sleep(ms) {
|
|
18114
|
-
return new Promise((
|
|
18114
|
+
return new Promise((resolve32) => setTimeout(resolve32, ms));
|
|
18115
18115
|
}
|
|
18116
18116
|
function describeError(error) {
|
|
18117
18117
|
return error instanceof Error ? error.message : String(error);
|
|
@@ -20370,6 +20370,27 @@ function registerBranch(program) {
|
|
|
20370
20370
|
// src/commands/cliHook.ts
|
|
20371
20371
|
import { basename as basename15 } from "path";
|
|
20372
20372
|
|
|
20373
|
+
// src/commands/backlog/isDocsLocked.ts
|
|
20374
|
+
import { and as and20, eq as eq48 } from "drizzle-orm";
|
|
20375
|
+
async function isDocsRefreshItem(itemId2) {
|
|
20376
|
+
const orm = await getDb();
|
|
20377
|
+
const [row3] = await orm.select({ itemId: links.itemId }).from(links).where(and20(eq48(links.itemId, itemId2), eq48(links.type, "docs-refresh"))).limit(1);
|
|
20378
|
+
return row3 !== void 0;
|
|
20379
|
+
}
|
|
20380
|
+
async function isDocsLocked() {
|
|
20381
|
+
if (docsRefreshAfter() === void 0) return false;
|
|
20382
|
+
const itemId2 = resolveSessionItemId();
|
|
20383
|
+
if (itemId2 === null) return false;
|
|
20384
|
+
try {
|
|
20385
|
+
return !await isDocsRefreshItem(itemId2);
|
|
20386
|
+
} catch {
|
|
20387
|
+
return false;
|
|
20388
|
+
} finally {
|
|
20389
|
+
await closeDb().catch(() => {
|
|
20390
|
+
});
|
|
20391
|
+
}
|
|
20392
|
+
}
|
|
20393
|
+
|
|
20373
20394
|
// src/shared/splitCompound.ts
|
|
20374
20395
|
import { parse } from "shell-quote";
|
|
20375
20396
|
|
|
@@ -21245,6 +21266,37 @@ ${questionsJson}`
|
|
|
21245
21266
|
};
|
|
21246
21267
|
}
|
|
21247
21268
|
|
|
21269
|
+
// src/commands/backlog/isDocsPath.ts
|
|
21270
|
+
import { relative as relative6, resolve as resolve18 } from "path";
|
|
21271
|
+
var DOCS_LOCK_REASON = "Docs under 'docs/' are locked during development: they are updated by the Refresh docs backlog item after stories ship, not during development. Leave docs untouched and carry on with the phase.";
|
|
21272
|
+
var RELATIVE_DOCS = /(?:^|[\s'"=(<>|;&:])(?:\.[/\\])?docs[/\\]/;
|
|
21273
|
+
function escapeRegExp(value) {
|
|
21274
|
+
return value.replace(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
|
|
21275
|
+
}
|
|
21276
|
+
function isDocsPath(filePath, root2 = getProjectRoot()) {
|
|
21277
|
+
const rel = relative6(root2, resolve18(root2, filePath)).replace(/\\/g, "/");
|
|
21278
|
+
return rel.startsWith("docs/");
|
|
21279
|
+
}
|
|
21280
|
+
function mentionsDocsPath(command, root2 = getProjectRoot()) {
|
|
21281
|
+
if (RELATIVE_DOCS.test(command)) return true;
|
|
21282
|
+
const absolute2 = `${root2.replace(/\\/g, "/")}/docs/`;
|
|
21283
|
+
return new RegExp(escapeRegExp(absolute2)).test(command.replace(/\\/g, "/"));
|
|
21284
|
+
}
|
|
21285
|
+
|
|
21286
|
+
// src/commands/cliHook/findDocsPathDeny.ts
|
|
21287
|
+
function findDocsPathDeny(toolName, rawCommand, root2) {
|
|
21288
|
+
const result = splitCompound(rawCommand);
|
|
21289
|
+
const parts = result.ok ? result.parts : [rawCommand];
|
|
21290
|
+
const writes = parts.some(
|
|
21291
|
+
(part) => mentionsDocsPath(part, root2) && !isApprovedRead(part, toolName)
|
|
21292
|
+
);
|
|
21293
|
+
if (!writes) return void 0;
|
|
21294
|
+
return {
|
|
21295
|
+
permissionDecision: "deny",
|
|
21296
|
+
permissionDecisionReason: DOCS_LOCK_REASON
|
|
21297
|
+
};
|
|
21298
|
+
}
|
|
21299
|
+
|
|
21248
21300
|
// src/commands/cliHook/logDeniedToolCall.ts
|
|
21249
21301
|
import { mkdirSync as mkdirSync14 } from "fs";
|
|
21250
21302
|
import { homedir as homedir18 } from "os";
|
|
@@ -21335,10 +21387,17 @@ function tryParseInput(raw) {
|
|
|
21335
21387
|
}
|
|
21336
21388
|
|
|
21337
21389
|
// src/commands/cliHook.ts
|
|
21390
|
+
async function decideBash(toolName, command) {
|
|
21391
|
+
const decision = decideCommand(toolName, command);
|
|
21392
|
+
if (decision?.permissionDecision === "deny") return decision;
|
|
21393
|
+
const docsDeny = findDocsPathDeny(toolName, command);
|
|
21394
|
+
if (docsDeny && await isDocsLocked()) return docsDeny;
|
|
21395
|
+
return decision;
|
|
21396
|
+
}
|
|
21338
21397
|
async function cliHook() {
|
|
21339
21398
|
const input = tryParseInput(await readStdin());
|
|
21340
21399
|
if (!input) return;
|
|
21341
|
-
const decision = input.kind === "command" ?
|
|
21400
|
+
const decision = input.kind === "command" ? await decideBash(input.toolName, input.command) : input.kind === "question" ? findAskQuestionDeny(input.command) : findRestrictedPathDeny(input.paths);
|
|
21342
21401
|
if (!decision) return;
|
|
21343
21402
|
console.log(
|
|
21344
21403
|
JSON.stringify({
|
|
@@ -21491,12 +21550,12 @@ function hasSubcommands(helpText) {
|
|
|
21491
21550
|
// src/commands/permitCliReads/runHelp.ts
|
|
21492
21551
|
import { exec as exec2 } from "child_process";
|
|
21493
21552
|
function runHelp(args) {
|
|
21494
|
-
return new Promise((
|
|
21553
|
+
return new Promise((resolve32) => {
|
|
21495
21554
|
exec2(
|
|
21496
21555
|
`${args.join(" ")} --help`,
|
|
21497
21556
|
{ encoding: "utf8", timeout: 3e4 },
|
|
21498
21557
|
(_err, stdout, stderr) => {
|
|
21499
|
-
|
|
21558
|
+
resolve32(stdout || stderr || "");
|
|
21500
21559
|
}
|
|
21501
21560
|
);
|
|
21502
21561
|
});
|
|
@@ -26309,6 +26368,15 @@ function decideCommentGuard(input, existingContent) {
|
|
|
26309
26368
|
return introduced.length > 0 ? denyReason(gate.marker) : void 0;
|
|
26310
26369
|
}
|
|
26311
26370
|
|
|
26371
|
+
// src/commands/editHook/decideDocsGuard.ts
|
|
26372
|
+
var WRITE_TOOLS = /* @__PURE__ */ new Set(["Edit", "Write", "MultiEdit"]);
|
|
26373
|
+
async function decideDocsGuard(input) {
|
|
26374
|
+
const filePath = input.tool_input.file_path;
|
|
26375
|
+
if (!WRITE_TOOLS.has(input.tool_name) || !filePath) return void 0;
|
|
26376
|
+
if (!isDocsPath(filePath)) return void 0;
|
|
26377
|
+
return await isDocsLocked() ? DOCS_LOCK_REASON : void 0;
|
|
26378
|
+
}
|
|
26379
|
+
|
|
26312
26380
|
// src/commands/dbMigration/consumeMigrationApproval.ts
|
|
26313
26381
|
import { existsSync as existsSync58, unlinkSync as unlinkSync11 } from "fs";
|
|
26314
26382
|
function consumeMigrationApproval(migrationId) {
|
|
@@ -26398,7 +26466,7 @@ async function editHook() {
|
|
|
26398
26466
|
const input = tryParseInput2(await readStdin());
|
|
26399
26467
|
if (!input) return;
|
|
26400
26468
|
const existing = input.tool_name === "Write" ? readExisting(input.tool_input.file_path) : void 0;
|
|
26401
|
-
const reason4 = decideOverrideGuard(input, existing) ?? decideCommentGuard(input, existing) ?? decideMigrationGuard(input, existing);
|
|
26469
|
+
const reason4 = decideOverrideGuard(input, existing) ?? decideCommentGuard(input, existing) ?? decideMigrationGuard(input, existing) ?? await decideDocsGuard(input);
|
|
26402
26470
|
if (!reason4) return;
|
|
26403
26471
|
console.log(
|
|
26404
26472
|
JSON.stringify({
|
|
@@ -29156,7 +29224,7 @@ import { copyFileSync, existsSync as existsSync62, mkdirSync as mkdirSync20 } fr
|
|
|
29156
29224
|
import { dirname as dirname33, join as join74 } from "path";
|
|
29157
29225
|
|
|
29158
29226
|
// src/commands/sessions/daemon/worktree/runInstall.ts
|
|
29159
|
-
import { resolve as
|
|
29227
|
+
import { resolve as resolve19 } from "path";
|
|
29160
29228
|
|
|
29161
29229
|
// src/commands/sessions/daemon/worktree/detectInstallCommand.ts
|
|
29162
29230
|
import { existsSync as existsSync61 } from "fs";
|
|
@@ -29297,7 +29365,7 @@ function installPaths(worktreePath, paths, onSeeded, onInstalling) {
|
|
|
29297
29365
|
onSeeded();
|
|
29298
29366
|
return;
|
|
29299
29367
|
}
|
|
29300
|
-
const dir =
|
|
29368
|
+
const dir = resolve19(worktreePath, rel);
|
|
29301
29369
|
const command = detectInstallCommand(dir);
|
|
29302
29370
|
if (!command) {
|
|
29303
29371
|
daemonLog(
|
|
@@ -29356,7 +29424,7 @@ function placedByDaemon() {
|
|
|
29356
29424
|
function seed(worktreePath, clone) {
|
|
29357
29425
|
console.log(`Preparing ${worktreePath}\u2026`);
|
|
29358
29426
|
return new Promise(
|
|
29359
|
-
(
|
|
29427
|
+
(resolve32) => seedWorktree(worktreePath, clone, resolve32)
|
|
29360
29428
|
);
|
|
29361
29429
|
}
|
|
29362
29430
|
async function moveToPrCheckoutTree() {
|
|
@@ -29444,7 +29512,7 @@ function prHeadBranch({
|
|
|
29444
29512
|
// src/commands/sessions/daemon/sendToDaemon.ts
|
|
29445
29513
|
var WRITE_TIMEOUT_MS = 500;
|
|
29446
29514
|
function sendToDaemon(message3) {
|
|
29447
|
-
return new Promise((
|
|
29515
|
+
return new Promise((resolve32, reject) => {
|
|
29448
29516
|
connectToDaemon().then((socket) => {
|
|
29449
29517
|
const timer = setTimeout(() => {
|
|
29450
29518
|
socket.destroy();
|
|
@@ -29458,7 +29526,7 @@ function sendToDaemon(message3) {
|
|
|
29458
29526
|
`, () => {
|
|
29459
29527
|
clearTimeout(timer);
|
|
29460
29528
|
socket.end();
|
|
29461
|
-
|
|
29529
|
+
resolve32();
|
|
29462
29530
|
});
|
|
29463
29531
|
}, reject);
|
|
29464
29532
|
});
|
|
@@ -29814,12 +29882,12 @@ function registerLitellm(program) {
|
|
|
29814
29882
|
|
|
29815
29883
|
// src/commands/mermaidExport.ts
|
|
29816
29884
|
import { mkdirSync as mkdirSync21, readdirSync as readdirSync12 } from "fs";
|
|
29817
|
-
import { resolve as
|
|
29885
|
+
import { resolve as resolve21 } from "path";
|
|
29818
29886
|
import chalk185 from "chalk";
|
|
29819
29887
|
|
|
29820
29888
|
// src/commands/mermaid/exportFile.ts
|
|
29821
29889
|
import { readFileSync as readFileSync41, writeFileSync as writeFileSync34 } from "fs";
|
|
29822
|
-
import { basename as basename22, extname as extname4, resolve as
|
|
29890
|
+
import { basename as basename22, extname as extname4, resolve as resolve20 } from "path";
|
|
29823
29891
|
import chalk184 from "chalk";
|
|
29824
29892
|
|
|
29825
29893
|
// src/commands/mermaid/renderBlock.ts
|
|
@@ -29867,7 +29935,7 @@ async function exportFile(file, outDir, krokiUrl, onlyIndex) {
|
|
|
29867
29935
|
for (const [i, source] of blocks.entries()) {
|
|
29868
29936
|
const idx = i + 1;
|
|
29869
29937
|
if (onlyIndex !== void 0 && idx !== onlyIndex) continue;
|
|
29870
|
-
const outPath =
|
|
29938
|
+
const outPath = resolve20(outDir, `${stem}-${idx}.svg`);
|
|
29871
29939
|
const svg = await renderBlock(krokiUrl, source);
|
|
29872
29940
|
writeFileSync34(outPath, svg, "utf8");
|
|
29873
29941
|
console.log(chalk184.green(` \u2192 ${outPath}`));
|
|
@@ -29881,7 +29949,7 @@ function extractMermaidBlocks(markdown) {
|
|
|
29881
29949
|
// src/commands/mermaidExport.ts
|
|
29882
29950
|
async function mermaidExport(file, options2 = {}) {
|
|
29883
29951
|
const { mermaid } = loadConfig();
|
|
29884
|
-
const outDir =
|
|
29952
|
+
const outDir = resolve21(process.cwd(), options2.out ?? ".");
|
|
29885
29953
|
mkdirSync21(outDir, { recursive: true });
|
|
29886
29954
|
if (options2.index !== void 0) {
|
|
29887
29955
|
if (!Number.isInteger(options2.index) || options2.index < 1) {
|
|
@@ -30009,18 +30077,18 @@ function emitExtract(out, header, texts) {
|
|
|
30009
30077
|
}
|
|
30010
30078
|
|
|
30011
30079
|
// src/commands/miro/resolveExtractPath.ts
|
|
30012
|
-
import { isAbsolute as isAbsolute4, relative as
|
|
30080
|
+
import { isAbsolute as isAbsolute4, relative as relative7, resolve as resolve22 } from "path";
|
|
30013
30081
|
function extractRoot(cwd) {
|
|
30014
30082
|
return findConfigUp(cwd)?.rootDir ?? cwd;
|
|
30015
30083
|
}
|
|
30016
30084
|
function resolveExtractPath(value, cwd) {
|
|
30017
30085
|
if (value === void 0) return void 0;
|
|
30018
|
-
return isAbsolute4(value) ? value :
|
|
30086
|
+
return isAbsolute4(value) ? value : resolve22(extractRoot(cwd), value);
|
|
30019
30087
|
}
|
|
30020
30088
|
function storedExtractPath(value, cwd) {
|
|
30021
30089
|
if (value === void 0) return void 0;
|
|
30022
|
-
const absolute2 =
|
|
30023
|
-
const within =
|
|
30090
|
+
const absolute2 = resolve22(cwd, value);
|
|
30091
|
+
const within = relative7(extractRoot(cwd), absolute2);
|
|
30024
30092
|
return within.startsWith("..") ? absolute2 : within;
|
|
30025
30093
|
}
|
|
30026
30094
|
|
|
@@ -30607,7 +30675,7 @@ async function prepareExtensionForLoad(port, filter = "") {
|
|
|
30607
30675
|
}
|
|
30608
30676
|
|
|
30609
30677
|
// src/commands/netcap/resolveNetcapOutPath.ts
|
|
30610
|
-
import { isAbsolute as isAbsolute5, join as join78, resolve as
|
|
30678
|
+
import { isAbsolute as isAbsolute5, join as join78, resolve as resolve23 } from "path";
|
|
30611
30679
|
|
|
30612
30680
|
// src/commands/netcap/defaultCapturePath.ts
|
|
30613
30681
|
import { homedir as homedir24 } from "os";
|
|
@@ -30619,7 +30687,7 @@ function defaultCapturePath() {
|
|
|
30619
30687
|
// src/commands/netcap/resolveNetcapOutPath.ts
|
|
30620
30688
|
function resolveNetcapOutPath(out) {
|
|
30621
30689
|
if (!out) return defaultCapturePath();
|
|
30622
|
-
const dir = isAbsolute5(out) ? out :
|
|
30690
|
+
const dir = isAbsolute5(out) ? out : resolve23(process.cwd(), out);
|
|
30623
30691
|
return join78(dir, "capture.jsonl");
|
|
30624
30692
|
}
|
|
30625
30693
|
|
|
@@ -30710,25 +30778,25 @@ function isVisibleText(t) {
|
|
|
30710
30778
|
return /[a-zA-Z]{3,}/.test(t);
|
|
30711
30779
|
}
|
|
30712
30780
|
var isHashtag = (t) => /^#[A-Za-z0-9_]+$/.test(t);
|
|
30713
|
-
function collectRscText(v,
|
|
30781
|
+
function collectRscText(v, resolve32, sink3, seen) {
|
|
30714
30782
|
if (v == null) return;
|
|
30715
30783
|
if (typeof v === "string") {
|
|
30716
30784
|
if (isRscRef(v)) {
|
|
30717
30785
|
if (!seen.has(v)) {
|
|
30718
30786
|
seen.add(v);
|
|
30719
|
-
collectRscText(
|
|
30787
|
+
collectRscText(resolve32(v), resolve32, sink3, seen);
|
|
30720
30788
|
}
|
|
30721
30789
|
} else if (isHashtag(v)) sink3.hashtags.push(v);
|
|
30722
30790
|
else if (isVisibleText(v)) sink3.text.push(v);
|
|
30723
30791
|
return;
|
|
30724
30792
|
}
|
|
30725
30793
|
if (Array.isArray(v)) {
|
|
30726
|
-
for (const x of v) collectRscText(x,
|
|
30794
|
+
for (const x of v) collectRscText(x, resolve32, sink3, seen);
|
|
30727
30795
|
return;
|
|
30728
30796
|
}
|
|
30729
30797
|
if (typeof v === "object") {
|
|
30730
30798
|
for (const val of Object.values(v)) {
|
|
30731
|
-
collectRscText(val,
|
|
30799
|
+
collectRscText(val, resolve32, sink3, seen);
|
|
30732
30800
|
}
|
|
30733
30801
|
}
|
|
30734
30802
|
}
|
|
@@ -30760,7 +30828,7 @@ function visitObjects(root2, fn) {
|
|
|
30760
30828
|
}
|
|
30761
30829
|
}
|
|
30762
30830
|
}
|
|
30763
|
-
function buildMentionMap(rows,
|
|
30831
|
+
function buildMentionMap(rows, resolve32) {
|
|
30764
30832
|
const map = /* @__PURE__ */ new Map();
|
|
30765
30833
|
visitObjects(rows, (o) => {
|
|
30766
30834
|
const url = profileActionUrl(o);
|
|
@@ -30768,7 +30836,7 @@ function buildMentionMap(rows, resolve31) {
|
|
|
30768
30836
|
const slug2 = slugFromProfileUrl(url);
|
|
30769
30837
|
if (!slug2 || map.has(slug2)) return;
|
|
30770
30838
|
const sink3 = { text: [], hashtags: [] };
|
|
30771
|
-
collectRscText(o.children,
|
|
30839
|
+
collectRscText(o.children, resolve32, sink3, /* @__PURE__ */ new Set());
|
|
30772
30840
|
const name = sink3.text.join(" ").replace(/\s+/g, " ").trim();
|
|
30773
30841
|
map.set(slug2, name ? { slug: slug2, name, url } : { slug: slug2, url });
|
|
30774
30842
|
});
|
|
@@ -30854,10 +30922,10 @@ function buildPost(raw, mentionMap, author) {
|
|
|
30854
30922
|
|
|
30855
30923
|
// src/commands/netcap/walkPostRow.ts
|
|
30856
30924
|
var isCommentary = (o) => asObject(o.viewTrackingSpecs)?.viewName === "feed-commentary";
|
|
30857
|
-
function walkPostRow(v,
|
|
30925
|
+
function walkPostRow(v, resolve32, raw) {
|
|
30858
30926
|
if (v == null || typeof v !== "object") return;
|
|
30859
30927
|
if (Array.isArray(v)) {
|
|
30860
|
-
for (const x of v) walkPostRow(x,
|
|
30928
|
+
for (const x of v) walkPostRow(x, resolve32, raw);
|
|
30861
30929
|
return;
|
|
30862
30930
|
}
|
|
30863
30931
|
const o = v;
|
|
@@ -30871,9 +30939,9 @@ function walkPostRow(v, resolve31, raw) {
|
|
|
30871
30939
|
}
|
|
30872
30940
|
if (isCommentary(o)) {
|
|
30873
30941
|
const sink3 = { text: raw.text, hashtags: raw.hashtags };
|
|
30874
|
-
collectRscText(o.children,
|
|
30942
|
+
collectRscText(o.children, resolve32, sink3, /* @__PURE__ */ new Set());
|
|
30875
30943
|
}
|
|
30876
|
-
for (const val of Object.values(o)) walkPostRow(val,
|
|
30944
|
+
for (const val of Object.values(o)) walkPostRow(val, resolve32, raw);
|
|
30877
30945
|
}
|
|
30878
30946
|
|
|
30879
30947
|
// src/commands/netcap/extractLinkedInPosts.ts
|
|
@@ -30887,8 +30955,8 @@ function findCommentaryRows(rows) {
|
|
|
30887
30955
|
}
|
|
30888
30956
|
function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
|
|
30889
30957
|
const rows = parseRscRows(flight);
|
|
30890
|
-
const
|
|
30891
|
-
const mentionMap = buildMentionMap(rows,
|
|
30958
|
+
const resolve32 = makeRscResolver(rows);
|
|
30959
|
+
const mentionMap = buildMentionMap(rows, resolve32);
|
|
30892
30960
|
const posts = [];
|
|
30893
30961
|
for (const id of findCommentaryRows(rows)) {
|
|
30894
30962
|
const raw = {
|
|
@@ -30898,7 +30966,7 @@ function extractLinkedInPosts(flight, author = findAuthorSlug(flight)) {
|
|
|
30898
30966
|
links: [],
|
|
30899
30967
|
related: []
|
|
30900
30968
|
};
|
|
30901
|
-
walkPostRow(rows[id],
|
|
30969
|
+
walkPostRow(rows[id], resolve32, raw);
|
|
30902
30970
|
const post2 = buildPost(raw, mentionMap, author);
|
|
30903
30971
|
if (post2) posts.push(post2);
|
|
30904
30972
|
}
|
|
@@ -31180,9 +31248,9 @@ async function list4() {
|
|
|
31180
31248
|
import chalk193 from "chalk";
|
|
31181
31249
|
|
|
31182
31250
|
// src/commands/backlog/removeFeed.ts
|
|
31183
|
-
import { eq as
|
|
31251
|
+
import { eq as eq49 } from "drizzle-orm";
|
|
31184
31252
|
async function removeFeed(db, url) {
|
|
31185
|
-
const deleted = await db.delete(feeds).where(
|
|
31253
|
+
const deleted = await db.delete(feeds).where(eq49(feeds.url, url)).returning({ id: feeds.id });
|
|
31186
31254
|
return deleted.length > 0;
|
|
31187
31255
|
}
|
|
31188
31256
|
|
|
@@ -32458,7 +32526,7 @@ ${resolves}` : baseWhy);
|
|
|
32458
32526
|
|
|
32459
32527
|
// src/commands/prs/parseScreenshotSpec.ts
|
|
32460
32528
|
import { statSync as statSync9 } from "fs";
|
|
32461
|
-
import { basename as basename23, extname as extname5, resolve as
|
|
32529
|
+
import { basename as basename23, extname as extname5, resolve as resolve24 } from "path";
|
|
32462
32530
|
function splitOnce(value, separator) {
|
|
32463
32531
|
const index2 = value.indexOf(separator);
|
|
32464
32532
|
if (index2 === -1) return null;
|
|
@@ -32474,7 +32542,7 @@ function isFile2(path108) {
|
|
|
32474
32542
|
function parseScreenshotSpec(spec) {
|
|
32475
32543
|
const [label, rawPath] = splitOnce(spec, "=") ?? ["", spec];
|
|
32476
32544
|
const [group, caption] = splitOnce(label, "/") ?? ["", label];
|
|
32477
|
-
const path108 =
|
|
32545
|
+
const path108 = resolve24(rawPath.trim());
|
|
32478
32546
|
const ext = extname5(path108).replace(/^\./, "").toLowerCase();
|
|
32479
32547
|
if (!isFile2(path108))
|
|
32480
32548
|
throw new Error(`--screenshot '${spec}': file not found: ${path108}`);
|
|
@@ -34747,7 +34815,7 @@ async function notify() {
|
|
|
34747
34815
|
import { execSync as execSync49 } from "child_process";
|
|
34748
34816
|
import { existsSync as existsSync65, mkdirSync as mkdirSync24, unlinkSync as unlinkSync15, writeFileSync as writeFileSync39 } from "fs";
|
|
34749
34817
|
import { tmpdir as tmpdir7 } from "os";
|
|
34750
|
-
import { join as join83, resolve as
|
|
34818
|
+
import { join as join83, resolve as resolve25 } from "path";
|
|
34751
34819
|
import chalk217 from "chalk";
|
|
34752
34820
|
|
|
34753
34821
|
// src/commands/screenshot/captureWindowPs1.ts
|
|
@@ -34881,7 +34949,7 @@ function buildOutputPath(outputDir, processName) {
|
|
|
34881
34949
|
mkdirSync24(outputDir, { recursive: true });
|
|
34882
34950
|
}
|
|
34883
34951
|
const timestamp8 = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
|
|
34884
|
-
return
|
|
34952
|
+
return resolve25(outputDir, `${processName}-${timestamp8}.png`);
|
|
34885
34953
|
}
|
|
34886
34954
|
function runPowerShellScript(processName, outputPath) {
|
|
34887
34955
|
const scriptPath = join83(tmpdir7(), `assist-screenshot-${Date.now()}.ps1`);
|
|
@@ -34897,7 +34965,7 @@ function runPowerShellScript(processName, outputPath) {
|
|
|
34897
34965
|
}
|
|
34898
34966
|
function screenshot(processName) {
|
|
34899
34967
|
const config = loadConfig();
|
|
34900
|
-
const outputDir =
|
|
34968
|
+
const outputDir = resolve25(config.screenshot.outputDir);
|
|
34901
34969
|
const outputPath = buildOutputPath(outputDir, processName);
|
|
34902
34970
|
console.log(chalk217.gray(`Capturing window for process "${processName}" ...`));
|
|
34903
34971
|
try {
|
|
@@ -34999,7 +35067,7 @@ function buildLimitsSegment(rateLimits) {
|
|
|
34999
35067
|
|
|
35000
35068
|
// src/commands/readGitBranch.ts
|
|
35001
35069
|
import { readFileSync as readFileSync48, statSync as statSync10 } from "fs";
|
|
35002
|
-
import { isAbsolute as isAbsolute6, join as join84, resolve as
|
|
35070
|
+
import { isAbsolute as isAbsolute6, join as join84, resolve as resolve26 } from "path";
|
|
35003
35071
|
function resolveGitDir(cwd) {
|
|
35004
35072
|
const dotGit = join84(cwd, ".git");
|
|
35005
35073
|
let stat5;
|
|
@@ -35022,7 +35090,7 @@ function resolveGitDir(cwd) {
|
|
|
35022
35090
|
return null;
|
|
35023
35091
|
}
|
|
35024
35092
|
const gitDir = match[1].trim();
|
|
35025
|
-
return isAbsolute6(gitDir) ? gitDir :
|
|
35093
|
+
return isAbsolute6(gitDir) ? gitDir : resolve26(cwd, gitDir);
|
|
35026
35094
|
}
|
|
35027
35095
|
function readGitBranch(cwd) {
|
|
35028
35096
|
const gitDir = resolveGitDir(cwd);
|
|
@@ -35336,7 +35404,7 @@ function getViolations(pattern2, options2 = {}, maxLines = DEFAULT_MAX_LINES2) {
|
|
|
35336
35404
|
|
|
35337
35405
|
// src/commands/refactor/check.ts
|
|
35338
35406
|
function runScript(script, cwd) {
|
|
35339
|
-
return new Promise((
|
|
35407
|
+
return new Promise((resolve32) => {
|
|
35340
35408
|
const child = spawn7("npm", ["run", script], {
|
|
35341
35409
|
stdio: "pipe",
|
|
35342
35410
|
shell: true,
|
|
@@ -35350,7 +35418,7 @@ function runScript(script, cwd) {
|
|
|
35350
35418
|
output += data.toString();
|
|
35351
35419
|
});
|
|
35352
35420
|
child.on("close", (code) => {
|
|
35353
|
-
|
|
35421
|
+
resolve32({ script, code: code ?? 1, output });
|
|
35354
35422
|
});
|
|
35355
35423
|
});
|
|
35356
35424
|
}
|
|
@@ -40155,12 +40223,12 @@ function onCloseResult(ctx, code) {
|
|
|
40155
40223
|
return { ...closed, stderr: ctx.stderr.value, stdout: ctx.stdout.value };
|
|
40156
40224
|
}
|
|
40157
40225
|
function waitForChildExit(ctx) {
|
|
40158
|
-
return new Promise((
|
|
40226
|
+
return new Promise((resolve32) => {
|
|
40159
40227
|
let settled = false;
|
|
40160
40228
|
const settle = (result) => {
|
|
40161
40229
|
if (settled) return;
|
|
40162
40230
|
settled = true;
|
|
40163
|
-
|
|
40231
|
+
resolve32(result);
|
|
40164
40232
|
};
|
|
40165
40233
|
ctx.child.on("error", (err) => settle(onErrorResult(ctx, err)));
|
|
40166
40234
|
ctx.child.on("close", (code) => settle(onCloseResult(ctx, code)));
|
|
@@ -42103,11 +42171,11 @@ import { randomUUID as randomUUID22 } from "crypto";
|
|
|
42103
42171
|
// src/commands/sessions/shared/sendShowPreview.ts
|
|
42104
42172
|
async function sendShowPreview(request) {
|
|
42105
42173
|
const socket = await connectToDaemon();
|
|
42106
|
-
await new Promise((
|
|
42174
|
+
await new Promise((resolve32, reject) => {
|
|
42107
42175
|
const finish2 = (error) => {
|
|
42108
42176
|
socket.destroy();
|
|
42109
42177
|
if (error) reject(error);
|
|
42110
|
-
else
|
|
42178
|
+
else resolve32();
|
|
42111
42179
|
};
|
|
42112
42180
|
readSocketLines(socket, (line) => {
|
|
42113
42181
|
const reply2 = parseReply(line);
|
|
@@ -43382,9 +43450,9 @@ function createReadlineInterface() {
|
|
|
43382
43450
|
});
|
|
43383
43451
|
}
|
|
43384
43452
|
function askQuestion2(rl, question) {
|
|
43385
|
-
return new Promise((
|
|
43453
|
+
return new Promise((resolve32) => {
|
|
43386
43454
|
rl.question(question, (answer) => {
|
|
43387
|
-
|
|
43455
|
+
resolve32(answer.trim());
|
|
43388
43456
|
});
|
|
43389
43457
|
});
|
|
43390
43458
|
}
|
|
@@ -44845,7 +44913,7 @@ function resolveParams(params, cliArgs) {
|
|
|
44845
44913
|
|
|
44846
44914
|
// src/commands/run/resolveRunCwd.ts
|
|
44847
44915
|
import { existsSync as existsSync82 } from "fs";
|
|
44848
|
-
import { resolve as
|
|
44916
|
+
import { resolve as resolve28 } from "path";
|
|
44849
44917
|
var MissingRunCwdError = class extends Error {
|
|
44850
44918
|
constructor(runName, cwd) {
|
|
44851
44919
|
super(`run config "${runName}": cwd ${cwd} does not exist`);
|
|
@@ -44856,7 +44924,7 @@ var MissingRunCwdError = class extends Error {
|
|
|
44856
44924
|
};
|
|
44857
44925
|
function resolveRunCwd(config, baseDir = runConfigBaseDir()) {
|
|
44858
44926
|
if (!config.cwd) return void 0;
|
|
44859
|
-
const cwd =
|
|
44927
|
+
const cwd = resolve28(baseDir, config.cwd);
|
|
44860
44928
|
if (!existsSync82(cwd)) throw new MissingRunCwdError(config.name, cwd);
|
|
44861
44929
|
return cwd;
|
|
44862
44930
|
}
|
|
@@ -44989,9 +45057,9 @@ function consumeMarker(path108) {
|
|
|
44989
45057
|
}
|
|
44990
45058
|
|
|
44991
45059
|
// src/commands/watch/gitMarkerPath.ts
|
|
44992
|
-
import { resolve as
|
|
45060
|
+
import { resolve as resolve29 } from "path";
|
|
44993
45061
|
function gitMarkerPath(name, cwd) {
|
|
44994
|
-
return
|
|
45062
|
+
return resolve29(
|
|
44995
45063
|
cwd ?? process.cwd(),
|
|
44996
45064
|
runGit3(["rev-parse", "--git-path", name], cwd)
|
|
44997
45065
|
);
|
|
@@ -45050,7 +45118,7 @@ function readMovement(cwd) {
|
|
|
45050
45118
|
var CONTROL_POLL_MS = 1e3;
|
|
45051
45119
|
function pollForMovement(options2) {
|
|
45052
45120
|
const { upstream, intervalMs, timeoutMs, timeout, cwd, control } = options2;
|
|
45053
|
-
return new Promise((
|
|
45121
|
+
return new Promise((resolve32) => {
|
|
45054
45122
|
let settled = false;
|
|
45055
45123
|
const finish2 = (outcome) => {
|
|
45056
45124
|
if (settled) return;
|
|
@@ -45059,7 +45127,7 @@ function pollForMovement(options2) {
|
|
|
45059
45127
|
clearInterval(controller);
|
|
45060
45128
|
clearTimeout(deadline);
|
|
45061
45129
|
process.off("SIGINT", onInterrupt);
|
|
45062
|
-
|
|
45130
|
+
resolve32(outcome);
|
|
45063
45131
|
};
|
|
45064
45132
|
const onInterrupt = () => finish2({ kind: "interrupted" });
|
|
45065
45133
|
const check2 = () => {
|
|
@@ -45200,12 +45268,12 @@ function decideLap(end, interrupted) {
|
|
|
45200
45268
|
import { spawn as spawn9 } from "child_process";
|
|
45201
45269
|
var WATCH_LAP_ARGS = ["watch", "wait", "--pull", "--build"];
|
|
45202
45270
|
function runWatchLap() {
|
|
45203
|
-
return new Promise((
|
|
45271
|
+
return new Promise((resolve32, reject) => {
|
|
45204
45272
|
const assistFromPath = spawn9("assist", WATCH_LAP_ARGS, {
|
|
45205
45273
|
stdio: "inherit",
|
|
45206
45274
|
shell: process.platform === "win32"
|
|
45207
45275
|
});
|
|
45208
|
-
assistFromPath.on("close", (code, signal) =>
|
|
45276
|
+
assistFromPath.on("close", (code, signal) => resolve32({ code, signal }));
|
|
45209
45277
|
assistFromPath.on("error", reject);
|
|
45210
45278
|
});
|
|
45211
45279
|
}
|
|
@@ -45552,12 +45620,12 @@ function parseEnvPairs(pairs) {
|
|
|
45552
45620
|
if (pairs.length === 0) return void 0;
|
|
45553
45621
|
const env = {};
|
|
45554
45622
|
for (const pair of pairs) {
|
|
45555
|
-
const
|
|
45556
|
-
if (
|
|
45623
|
+
const eq52 = pair.indexOf("=");
|
|
45624
|
+
if (eq52 <= 0) {
|
|
45557
45625
|
console.error(`--env must be KEY=VALUE, got "${pair}"`);
|
|
45558
45626
|
process.exit(1);
|
|
45559
45627
|
}
|
|
45560
|
-
env[pair.slice(0,
|
|
45628
|
+
env[pair.slice(0, eq52)] = pair.slice(eq52 + 1);
|
|
45561
45629
|
}
|
|
45562
45630
|
return env;
|
|
45563
45631
|
}
|
|
@@ -45570,11 +45638,11 @@ function fail9(spec) {
|
|
|
45570
45638
|
process.exit(1);
|
|
45571
45639
|
}
|
|
45572
45640
|
function parseParamSpec(spec) {
|
|
45573
|
-
const
|
|
45574
|
-
const name =
|
|
45575
|
-
if (
|
|
45576
|
-
if (
|
|
45577
|
-
return { name, default: spec.slice(
|
|
45641
|
+
const eq52 = spec.indexOf("=");
|
|
45642
|
+
const name = eq52 === -1 ? spec : spec.slice(0, eq52);
|
|
45643
|
+
if (eq52 !== -1) {
|
|
45644
|
+
if (eq52 === 0 || name.endsWith("!")) fail9(spec);
|
|
45645
|
+
return { name, default: spec.slice(eq52 + 1) };
|
|
45578
45646
|
}
|
|
45579
45647
|
if (name.endsWith("!")) {
|
|
45580
45648
|
if (name.length === 1) fail9(spec);
|
|
@@ -45892,10 +45960,10 @@ var STATUS_TIMEOUT_MS2 = 5e3;
|
|
|
45892
45960
|
function queryDaemon(socket) {
|
|
45893
45961
|
socket.write(`${JSON.stringify({ type: "ping" })}
|
|
45894
45962
|
`);
|
|
45895
|
-
return new Promise((
|
|
45963
|
+
return new Promise((resolve32) => {
|
|
45896
45964
|
const result = { sessions: [] };
|
|
45897
45965
|
const pending = /* @__PURE__ */ new Set(["sessions", "pong"]);
|
|
45898
|
-
const timer = setTimeout(() =>
|
|
45966
|
+
const timer = setTimeout(() => resolve32(result), STATUS_TIMEOUT_MS2);
|
|
45899
45967
|
const lines2 = createInterface8({ input: socket });
|
|
45900
45968
|
lines2.on("error", () => {
|
|
45901
45969
|
});
|
|
@@ -45903,7 +45971,7 @@ function queryDaemon(socket) {
|
|
|
45903
45971
|
applyLine(result, pending, line);
|
|
45904
45972
|
if (pending.size === 0) {
|
|
45905
45973
|
clearTimeout(timer);
|
|
45906
|
-
|
|
45974
|
+
resolve32(result);
|
|
45907
45975
|
}
|
|
45908
45976
|
});
|
|
45909
45977
|
});
|
|
@@ -46003,11 +46071,11 @@ function clearPersistedSessionsOnDrain() {
|
|
|
46003
46071
|
|
|
46004
46072
|
// src/commands/sessions/daemon/readDaemonMessage.ts
|
|
46005
46073
|
function readDaemonMessage(lines2, timeoutMs, fallback, match) {
|
|
46006
|
-
return new Promise((
|
|
46074
|
+
return new Promise((resolve32) => {
|
|
46007
46075
|
const finish2 = (value) => {
|
|
46008
46076
|
clearTimeout(timer);
|
|
46009
46077
|
lines2.off("line", onLine);
|
|
46010
|
-
|
|
46078
|
+
resolve32(value);
|
|
46011
46079
|
};
|
|
46012
46080
|
const timer = setTimeout(() => finish2(fallback), timeoutMs);
|
|
46013
46081
|
const onLine = (line) => {
|
|
@@ -46454,7 +46522,7 @@ function broadcastSessions(sessions, clients, linkedSessions = [], active) {
|
|
|
46454
46522
|
|
|
46455
46523
|
// src/commands/sessions/daemon/findServerParents.ts
|
|
46456
46524
|
import { existsSync as existsSync86 } from "fs";
|
|
46457
|
-
import { join as join105, resolve as
|
|
46525
|
+
import { join as join105, resolve as resolve30 } from "path";
|
|
46458
46526
|
function isLive(session) {
|
|
46459
46527
|
return !!session.pty && session.status !== "done" && session.status !== "error";
|
|
46460
46528
|
}
|
|
@@ -46463,13 +46531,13 @@ function isLiveAgent(session) {
|
|
|
46463
46531
|
}
|
|
46464
46532
|
function serverRunDirs(sessions, file) {
|
|
46465
46533
|
return new Set(
|
|
46466
|
-
sessions.filter((s) => s.server && s.cwd && isLive(s)).map((s) =>
|
|
46534
|
+
sessions.filter((s) => s.server && s.cwd && isLive(s)).map((s) => resolve30(s.cwd)).filter((dir) => existsSync86(join105(dir, file)))
|
|
46467
46535
|
);
|
|
46468
46536
|
}
|
|
46469
46537
|
function findServerParents(sessions, file) {
|
|
46470
46538
|
const all = [...sessions.values()];
|
|
46471
46539
|
const dirs = serverRunDirs(all, file);
|
|
46472
|
-
return all.filter((s) => isLiveAgent(s) && s.cwd && dirs.has(
|
|
46540
|
+
return all.filter((s) => isLiveAgent(s) && s.cwd && dirs.has(resolve30(s.cwd)));
|
|
46473
46541
|
}
|
|
46474
46542
|
|
|
46475
46543
|
// src/commands/sessions/daemon/lastWriteTimes.ts
|
|
@@ -46481,7 +46549,7 @@ function asRecord(value) {
|
|
|
46481
46549
|
}
|
|
46482
46550
|
|
|
46483
46551
|
// src/commands/sessions/shared/writtenFilePaths.ts
|
|
46484
|
-
var
|
|
46552
|
+
var WRITE_TOOLS2 = /* @__PURE__ */ new Set(["Write", "Edit", "MultiEdit", "NotebookEdit"]);
|
|
46485
46553
|
function writtenFilePaths(entry) {
|
|
46486
46554
|
if (entry.type !== "assistant") return [];
|
|
46487
46555
|
const content = asRecord(entry.message)?.content;
|
|
@@ -46489,7 +46557,7 @@ function writtenFilePaths(entry) {
|
|
|
46489
46557
|
const paths = [];
|
|
46490
46558
|
for (const block of content) {
|
|
46491
46559
|
const b = asRecord(block);
|
|
46492
|
-
if (b?.type !== "tool_use" || !
|
|
46560
|
+
if (b?.type !== "tool_use" || !WRITE_TOOLS2.has(String(b.name))) continue;
|
|
46493
46561
|
const input = asRecord(b.input);
|
|
46494
46562
|
const path108 = input?.file_path ?? input?.notebook_path;
|
|
46495
46563
|
if (typeof path108 === "string") paths.push(path108);
|
|
@@ -47348,11 +47416,11 @@ var autoUpdateControl = {
|
|
|
47348
47416
|
persist2(value);
|
|
47349
47417
|
wake?.();
|
|
47350
47418
|
},
|
|
47351
|
-
sleep: (ms) => new Promise((
|
|
47419
|
+
sleep: (ms) => new Promise((resolve32) => {
|
|
47352
47420
|
const done2 = () => {
|
|
47353
47421
|
clearTimeout(timer);
|
|
47354
47422
|
if (wake === done2) wake = void 0;
|
|
47355
|
-
|
|
47423
|
+
resolve32();
|
|
47356
47424
|
};
|
|
47357
47425
|
const timer = setTimeout(done2, ms);
|
|
47358
47426
|
wake = done2;
|
|
@@ -47765,7 +47833,7 @@ function clearLapSignals(cwd) {
|
|
|
47765
47833
|
}
|
|
47766
47834
|
function runUpdateLap(cwd, onOutput) {
|
|
47767
47835
|
clearLapSignals(cwd);
|
|
47768
|
-
return new Promise((
|
|
47836
|
+
return new Promise((resolve32, reject) => {
|
|
47769
47837
|
const { ASSIST_ACTIVITY_ID: _activity, ...env } = process.env;
|
|
47770
47838
|
const child = spawn11(
|
|
47771
47839
|
process.execPath,
|
|
@@ -47785,7 +47853,7 @@ function runUpdateLap(cwd, onOutput) {
|
|
|
47785
47853
|
child.stderr.on("data", (chunk) => onOutput(chunk.toString()));
|
|
47786
47854
|
child.on("close", (code, signal) => {
|
|
47787
47855
|
process.off("exit", killWithDaemon);
|
|
47788
|
-
|
|
47856
|
+
resolve32({ code, signal });
|
|
47789
47857
|
});
|
|
47790
47858
|
child.on("error", (error) => {
|
|
47791
47859
|
process.off("exit", killWithDaemon);
|
|
@@ -48196,12 +48264,12 @@ function processCwd(link3) {
|
|
|
48196
48264
|
var POLL_MS2 = 500;
|
|
48197
48265
|
var GRACE_MS = 5e3;
|
|
48198
48266
|
function awaitTreeVacated(session, treePath) {
|
|
48199
|
-
return new Promise((
|
|
48267
|
+
return new Promise((resolve32) => {
|
|
48200
48268
|
let ticks = GRACE_MS / POLL_MS2;
|
|
48201
48269
|
const settle = (outcome) => {
|
|
48202
48270
|
clearTimeout(timer);
|
|
48203
48271
|
session.closeGrace = void 0;
|
|
48204
|
-
|
|
48272
|
+
resolve32(outcome);
|
|
48205
48273
|
};
|
|
48206
48274
|
const tick = () => {
|
|
48207
48275
|
if (liveProcessesInTree(treePath).length === 0) settle("vacated");
|
|
@@ -48908,7 +48976,7 @@ function emitSessionOutput(session, clients, data) {
|
|
|
48908
48976
|
|
|
48909
48977
|
// src/commands/sessions/daemon/exitReason.ts
|
|
48910
48978
|
import { existsSync as existsSync95 } from "fs";
|
|
48911
|
-
import { resolve as
|
|
48979
|
+
import { resolve as resolve31 } from "path";
|
|
48912
48980
|
function exitDetail(session) {
|
|
48913
48981
|
if (session.cwd && !existsSync95(session.cwd))
|
|
48914
48982
|
return `working directory ${session.cwd} no longer exists`;
|
|
@@ -48923,7 +48991,7 @@ function missingRunConfigCwd(session) {
|
|
|
48923
48991
|
const dir = session.cwd ?? process.cwd();
|
|
48924
48992
|
const config = resolveRunConfig(session.runName, dir);
|
|
48925
48993
|
if (!config?.cwd) return void 0;
|
|
48926
|
-
const configured =
|
|
48994
|
+
const configured = resolve31(runConfigBaseDirFrom(dir), config.cwd);
|
|
48927
48995
|
if (existsSync95(configured)) return void 0;
|
|
48928
48996
|
return `run config "${config.name}": cwd ${configured} does not exist`;
|
|
48929
48997
|
}
|
|
@@ -48995,10 +49063,10 @@ function applyReviewPause(session, activity2) {
|
|
|
48995
49063
|
}
|
|
48996
49064
|
|
|
48997
49065
|
// src/shared/db/getPhaseActiveMs.ts
|
|
48998
|
-
import { and as
|
|
49066
|
+
import { and as and21, eq as eq50 } from "drizzle-orm";
|
|
48999
49067
|
async function getPhaseActiveMs(db, itemId2, phaseIdx) {
|
|
49000
49068
|
const [row3] = await db.select({ activeMs: phaseUsage.activeMs }).from(phaseUsage).where(
|
|
49001
|
-
|
|
49069
|
+
and21(eq50(phaseUsage.itemId, itemId2), eq50(phaseUsage.phaseIdx, phaseIdx))
|
|
49002
49070
|
);
|
|
49003
49071
|
return row3?.activeMs ?? 0;
|
|
49004
49072
|
}
|
|
@@ -49885,17 +49953,17 @@ async function recordPhaseTranscriptUsage(db, itemId2, phaseIdx, responses) {
|
|
|
49885
49953
|
}
|
|
49886
49954
|
|
|
49887
49955
|
// src/shared/db/recordWindowTokens.ts
|
|
49888
|
-
import { and as
|
|
49956
|
+
import { and as and22, eq as eq51, sql as sql29 } from "drizzle-orm";
|
|
49889
49957
|
async function recordWindowTokens(db, window, resetsAt, tokensUp, tokensDown) {
|
|
49890
49958
|
if (tokensUp <= 0 && tokensDown <= 0) return;
|
|
49891
49959
|
await db.update(usagePeaks).set({
|
|
49892
49960
|
tokensUp: sql29`${usagePeaks.tokensUp} + ${tokensUp}`,
|
|
49893
49961
|
tokensDown: sql29`${usagePeaks.tokensDown} + ${tokensDown}`
|
|
49894
49962
|
}).where(
|
|
49895
|
-
|
|
49896
|
-
|
|
49897
|
-
|
|
49898
|
-
|
|
49963
|
+
and22(
|
|
49964
|
+
eq51(usagePeaks.window, window),
|
|
49965
|
+
eq51(usagePeaks.resetsAt, resetsAt),
|
|
49966
|
+
eq51(usagePeaks.segment, 0)
|
|
49899
49967
|
)
|
|
49900
49968
|
);
|
|
49901
49969
|
}
|
|
@@ -51754,7 +51822,7 @@ function failPendingCreators(state, message3) {
|
|
|
51754
51822
|
}
|
|
51755
51823
|
function resetRelayState(state, reason4) {
|
|
51756
51824
|
failPendingCreators(state, reason4);
|
|
51757
|
-
for (const
|
|
51825
|
+
for (const resolve32 of state.historyWaiters) resolve32([]);
|
|
51758
51826
|
state.historyWaiters = [];
|
|
51759
51827
|
state.sessions = [];
|
|
51760
51828
|
state.lastSnapshot = void 0;
|
|
@@ -52147,16 +52215,16 @@ var HISTORY_TIMEOUT_MS = 5e3;
|
|
|
52147
52215
|
function requestLinkHistory(ctx) {
|
|
52148
52216
|
if (!ctx.greeted) return Promise.resolve([]);
|
|
52149
52217
|
const waiters = ctx.relay.historyWaiters;
|
|
52150
|
-
return new Promise((
|
|
52218
|
+
return new Promise((resolve32) => {
|
|
52151
52219
|
const settle = (sessions) => {
|
|
52152
52220
|
clearTimeout(timer);
|
|
52153
|
-
|
|
52221
|
+
resolve32(sessions);
|
|
52154
52222
|
};
|
|
52155
52223
|
const timer = setTimeout(() => {
|
|
52156
52224
|
const index2 = waiters.indexOf(settle);
|
|
52157
52225
|
if (index2 !== -1) waiters.splice(index2, 1);
|
|
52158
52226
|
daemonLog(`link ${ctx.spec.name} ws: history timed out`);
|
|
52159
|
-
|
|
52227
|
+
resolve32(ctx.relay.lastHistory ?? []);
|
|
52160
52228
|
}, HISTORY_TIMEOUT_MS);
|
|
52161
52229
|
timer.unref?.();
|
|
52162
52230
|
waiters.push(settle);
|
|
@@ -52908,7 +52976,7 @@ function claudeMessages(line) {
|
|
|
52908
52976
|
}
|
|
52909
52977
|
|
|
52910
52978
|
// src/commands/sessions/daemon/historySearch/findTranscriptMatch.ts
|
|
52911
|
-
function
|
|
52979
|
+
function escapeRegExp2(text18) {
|
|
52912
52980
|
return text18.replace(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
|
|
52913
52981
|
}
|
|
52914
52982
|
function encodesVerbatimInJson(query) {
|
|
@@ -52927,7 +52995,7 @@ function matchTexts(texts, pattern2) {
|
|
|
52927
52995
|
return null;
|
|
52928
52996
|
}
|
|
52929
52997
|
function queryPattern(query) {
|
|
52930
|
-
return new RegExp(
|
|
52998
|
+
return new RegExp(escapeRegExp2(query), "i");
|
|
52931
52999
|
}
|
|
52932
53000
|
async function findTranscriptMatch(filePath, harness, query) {
|
|
52933
53001
|
const pattern2 = queryPattern(query);
|
|
@@ -53507,12 +53575,12 @@ import { execFile as execFile15 } from "child_process";
|
|
|
53507
53575
|
import { existsSync as existsSync102 } from "fs";
|
|
53508
53576
|
function prHeadBranch2(number, cwd) {
|
|
53509
53577
|
const { headBranch } = prCliCommands(number, cwd);
|
|
53510
|
-
return new Promise((
|
|
53578
|
+
return new Promise((resolve32) => {
|
|
53511
53579
|
execFile15(
|
|
53512
53580
|
headBranch.file,
|
|
53513
53581
|
headBranch.args,
|
|
53514
53582
|
{ cwd, encoding: "utf8", windowsHide: true },
|
|
53515
|
-
(error, stdout) =>
|
|
53583
|
+
(error, stdout) => resolve32(error ? null : headBranch.parse(stdout))
|
|
53516
53584
|
);
|
|
53517
53585
|
});
|
|
53518
53586
|
}
|