mossbear 0.1.0-alpha.58 → 0.1.0-alpha.60
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/action-queue.d.ts +3 -1
- package/dist/action-queue.d.ts.map +1 -1
- package/dist/action-queue.js +63 -17
- package/dist/action-queue.js.map +1 -1
- package/dist/commands/{notes.d.ts → comments.d.ts} +13 -7
- package/dist/commands/comments.d.ts.map +1 -0
- package/dist/commands/{notes.js → comments.js} +32 -27
- package/dist/commands/comments.js.map +1 -0
- package/dist/commands/link.d.ts.map +1 -1
- package/dist/commands/link.js +12 -2
- package/dist/commands/link.js.map +1 -1
- package/dist/commands/pull.js +9 -9
- package/dist/commands/pull.js.map +1 -1
- package/dist/context/pull.d.ts +4 -4
- package/dist/context/pull.d.ts.map +1 -1
- package/dist/context/pull.js +5 -5
- package/dist/context/pull.js.map +1 -1
- package/dist/dashboard-error.d.ts +9 -3
- package/dist/dashboard-error.d.ts.map +1 -1
- package/dist/dashboard-error.js +20 -4
- package/dist/dashboard-error.js.map +1 -1
- package/dist/dashboard-health.d.ts +4 -4
- package/dist/dashboard-health.js +4 -4
- package/dist/docs/{notes-scope.d.ts → comments-scope.d.ts} +12 -12
- package/dist/docs/comments-scope.d.ts.map +1 -0
- package/dist/docs/{notes-scope.js → comments-scope.js} +8 -8
- package/dist/docs/comments-scope.js.map +1 -0
- package/dist/docs/{item-notes-client.d.ts → item-comments-client.d.ts} +22 -15
- package/dist/docs/item-comments-client.d.ts.map +1 -0
- package/dist/docs/{item-notes-client.js → item-comments-client.js} +42 -22
- package/dist/docs/item-comments-client.js.map +1 -0
- package/dist/docs/{item-notes.d.ts → item-comments.d.ts} +40 -37
- package/dist/docs/item-comments.d.ts.map +1 -0
- package/dist/docs/item-comments.js +230 -0
- package/dist/docs/item-comments.js.map +1 -0
- package/dist/docs/sync-docs.d.ts +14 -14
- package/dist/docs/sync-docs.d.ts.map +1 -1
- package/dist/docs/sync-docs.js +16 -16
- package/dist/docs/sync-docs.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/lifecycle/operations.d.ts +6 -6
- package/dist/lifecycle/operations.d.ts.map +1 -1
- package/dist/lifecycle/operations.js +21 -23
- package/dist/lifecycle/operations.js.map +1 -1
- package/dist/mcp/client.d.ts +5 -5
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +3 -3
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/server.d.ts +6 -4
- package/dist/mcp/server.d.ts.map +1 -1
- package/dist/mcp/server.js +100 -34
- package/dist/mcp/server.js.map +1 -1
- package/dist/rules/import-candidates.d.ts +85 -7
- package/dist/rules/import-candidates.d.ts.map +1 -1
- package/dist/rules/import-candidates.js +113 -6
- package/dist/rules/import-candidates.js.map +1 -1
- package/dist/rules/import-picker.d.ts +26 -2
- package/dist/rules/import-picker.d.ts.map +1 -1
- package/dist/rules/import-picker.js +60 -3
- package/dist/rules/import-picker.js.map +1 -1
- package/dist/run-self-report.d.ts.map +1 -1
- package/dist/run-self-report.js +3 -2
- package/dist/run-self-report.js.map +1 -1
- package/dist/skill-template.d.ts +2 -2
- package/dist/skill-template.d.ts.map +1 -1
- package/dist/skill-template.js +15 -14
- package/dist/skill-template.js.map +1 -1
- package/dist/transcript/adapters.d.ts +28 -0
- package/dist/transcript/adapters.d.ts.map +1 -0
- package/dist/transcript/adapters.js +112 -0
- package/dist/transcript/adapters.js.map +1 -0
- package/dist/transcript/messages.d.ts +19 -6
- package/dist/transcript/messages.d.ts.map +1 -1
- package/dist/transcript/messages.js +95 -14
- package/dist/transcript/messages.js.map +1 -1
- package/dist/transcript/narration.d.ts +11 -2
- package/dist/transcript/narration.d.ts.map +1 -1
- package/dist/transcript/narration.js +48 -2
- package/dist/transcript/narration.js.map +1 -1
- package/dist/usage/extract.js +2 -2
- package/dist/usage/extract.js.map +1 -1
- package/dist/usage/roots.d.ts.map +1 -1
- package/dist/usage/roots.js +6 -8
- package/dist/usage/roots.js.map +1 -1
- package/package.json +4 -4
- package/dist/commands/notes.d.ts.map +0 -1
- package/dist/commands/notes.js.map +0 -1
- package/dist/docs/item-notes-client.d.ts.map +0 -1
- package/dist/docs/item-notes-client.js.map +0 -1
- package/dist/docs/item-notes.d.ts.map +0 -1
- package/dist/docs/item-notes.js +0 -168
- package/dist/docs/item-notes.js.map +0 -1
- package/dist/docs/notes-scope.d.ts.map +0 -1
- package/dist/docs/notes-scope.js.map +0 -1
- package/dist/usage/adapters.d.ts +0 -11
- package/dist/usage/adapters.d.ts.map +0 -1
- package/dist/usage/adapters.js +0 -31
- package/dist/usage/adapters.js.map +0 -1
package/dist/action-queue.d.ts
CHANGED
|
@@ -58,5 +58,7 @@ export declare function writeActionCursors(path: string, cursors: ActionCursors)
|
|
|
58
58
|
* advancing the cursor would wedge every later line in that session behind a
|
|
59
59
|
* permanently invalid one.
|
|
60
60
|
*/
|
|
61
|
-
export declare function readPendingActions(runsDir: string, cursors: ActionCursors, narrationDisabledRepoIds?: ReadonlySet<string> | null
|
|
61
|
+
export declare function readPendingActions(runsDir: string, cursors: ActionCursors, narrationDisabledRepoIds?: ReadonlySet<string> | null,
|
|
62
|
+
/** Optional transcript search roots, including an explicit scan directory. */
|
|
63
|
+
transcriptRoots?: readonly string[]): Promise<PendingActionsResult>;
|
|
62
64
|
//# sourceMappingURL=action-queue.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-queue.d.ts","sourceRoot":"","sources":["../src/action-queue.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EACV,WAAW,EAEX,mBAAmB,
|
|
1
|
+
{"version":3,"file":"action-queue.d.ts","sourceRoot":"","sources":["../src/action-queue.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EACV,WAAW,EAEX,mBAAmB,EAGpB,MAAM,oBAAoB,CAAA;AAQ3B,2DAA2D;AAC3D,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAElD,MAAM,MAAM,oBAAoB,GAAG;IACjC,uEAAuE;IACvE,OAAO,EAAE,mBAAmB,EAAE,CAAA;IAC9B,mDAAmD;IACnD,OAAO,EAAE,aAAa,CAAA;IACtB,iEAAiE;IACjE,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB;;;;;;;;;;;OAWG;IACH,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACxC,CAAA;AAoCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAWrD;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAc1D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,MAAM,CAEtF;AA2CD,gFAAgF;AAChF,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAoB5E;AAED,iDAAiD;AACjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;;GAOG;AACH,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,EACtB,wBAAwB,GAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAW;AAC3D,8EAA8E;AAC9E,eAAe,CAAC,EAAE,SAAS,MAAM,EAAE,GAClC,OAAO,CAAC,oBAAoB,CAAC,CAoM/B"}
|
package/dist/action-queue.js
CHANGED
|
@@ -31,8 +31,8 @@ import { basename, extname, join } from 'node:path';
|
|
|
31
31
|
import { sanitizeCommand } from '@mossbear/eval-core';
|
|
32
32
|
import { SKILL_LOAD_ACTION_TYPE, parseActionEntry } from '@mossbear/protocol';
|
|
33
33
|
import { ensureMossbearDir } from './config.js';
|
|
34
|
-
import {
|
|
35
|
-
import {
|
|
34
|
+
import { narrateTranscriptActions } from './transcript/adapters.js';
|
|
35
|
+
import { resolveTranscriptSource } from './usage/roots.js';
|
|
36
36
|
/** Cap on a generated summary, matching `sanitizeCommand`'s own command cap. */
|
|
37
37
|
const MAX_SUMMARY_CHARS = 200;
|
|
38
38
|
/** Session-id sentinel the hook writes when an event carries no session id. */
|
|
@@ -199,11 +199,14 @@ export async function writeActionCursors(path, cursors) {
|
|
|
199
199
|
* advancing the cursor would wedge every later line in that session behind a
|
|
200
200
|
* permanently invalid one.
|
|
201
201
|
*/
|
|
202
|
-
export async function readPendingActions(runsDir, cursors, narrationDisabledRepoIds = null
|
|
202
|
+
export async function readPendingActions(runsDir, cursors, narrationDisabledRepoIds = null,
|
|
203
|
+
/** Optional transcript search roots, including an explicit scan directory. */
|
|
204
|
+
transcriptRoots) {
|
|
203
205
|
const actions = [];
|
|
204
206
|
const nextCursors = { ...cursors };
|
|
205
207
|
const skippedSessions = [];
|
|
206
208
|
const transcriptPaths = {};
|
|
209
|
+
const sessions = [];
|
|
207
210
|
let files;
|
|
208
211
|
try {
|
|
209
212
|
files = (await readdir(runsDir)).filter((f) => f.endsWith('.jsonl'));
|
|
@@ -246,6 +249,9 @@ export async function readPendingActions(runsDir, cursors, narrationDisabledRepo
|
|
|
246
249
|
// opening turn's prose to a much later action, which is the confidently
|
|
247
250
|
// wrong outcome the module is built to avoid.
|
|
248
251
|
const sessionActions = [];
|
|
252
|
+
let sessionHarness;
|
|
253
|
+
let mixedHarness = false;
|
|
254
|
+
let narrationOptedOut = false;
|
|
249
255
|
// An unparseable or unidentifiable line is an alignment break, not a line
|
|
250
256
|
// to skip past. Omitting it compresses this sequence while the transcript
|
|
251
257
|
// still holds that tool call, so the *next* line with the same tool name
|
|
@@ -261,7 +267,15 @@ export async function readPendingActions(runsDir, cursors, narrationDisabledRepo
|
|
|
261
267
|
alignmentBroken = true;
|
|
262
268
|
break;
|
|
263
269
|
}
|
|
264
|
-
sessionActions.push({ id, toolName: entry.toolName });
|
|
270
|
+
sessionActions.push({ id, toolName: entry.toolName, timestamp: entry.timestamp });
|
|
271
|
+
if (entry.repoId && narrationDisabledRepoIds?.has(entry.repoId)) {
|
|
272
|
+
narrationOptedOut = true;
|
|
273
|
+
}
|
|
274
|
+
if (entry.harness) {
|
|
275
|
+
if (sessionHarness && sessionHarness !== entry.harness)
|
|
276
|
+
mixedHarness = true;
|
|
277
|
+
sessionHarness = entry.harness;
|
|
278
|
+
}
|
|
265
279
|
}
|
|
266
280
|
catch {
|
|
267
281
|
alignmentBroken = true;
|
|
@@ -294,19 +308,54 @@ export async function readPendingActions(runsDir, cursors, narrationDisabledRepo
|
|
|
294
308
|
}
|
|
295
309
|
pending.push({ entry, id });
|
|
296
310
|
}
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
311
|
+
sessions.push({
|
|
312
|
+
agentSessionId,
|
|
313
|
+
sessionActions,
|
|
314
|
+
sessionHarness,
|
|
315
|
+
alignmentBroken: alignmentBroken || mixedHarness,
|
|
316
|
+
narrationOptedOut,
|
|
317
|
+
pending,
|
|
318
|
+
});
|
|
319
|
+
if (sessionSkipped)
|
|
320
|
+
skippedSessions.push(agentSessionId);
|
|
321
|
+
nextCursors[agentSessionId] = lines.length;
|
|
322
|
+
}
|
|
323
|
+
// Resolve every pending session before narration. Codex post_tool_use does
|
|
324
|
+
// not report a transcript path, so the rollout filename must be discovered
|
|
325
|
+
// here, before actions are sent. The same paths are returned for usage sync.
|
|
326
|
+
if (narrationDisabledRepoIds !== null && sessions.length > 0) {
|
|
327
|
+
const source = await resolveTranscriptSource({
|
|
328
|
+
uploadsActions: true,
|
|
329
|
+
sessionIds: sessions.map((session) => session.agentSessionId),
|
|
330
|
+
reportedPaths: transcriptPaths,
|
|
331
|
+
...(transcriptRoots ? { roots: transcriptRoots } : {}),
|
|
332
|
+
});
|
|
333
|
+
if (source?.mode === 'sessions') {
|
|
334
|
+
for (const file of source.files) {
|
|
335
|
+
if (file.agentSessionId)
|
|
336
|
+
transcriptPaths[file.agentSessionId] = file.path;
|
|
337
|
+
}
|
|
338
|
+
}
|
|
339
|
+
}
|
|
340
|
+
for (const session of sessions) {
|
|
341
|
+
const { agentSessionId, sessionActions, sessionHarness, alignmentBroken, narrationOptedOut, pending, } = session;
|
|
342
|
+
// Narration is resolved once per session, then attached by action id. If
|
|
343
|
+
// any action came from an opted-out repo, transcript prose has no repo
|
|
344
|
+
// provenance, so withhold it for the entire session rather than carry it
|
|
345
|
+
// across a repo boundary into an opted-in action.
|
|
300
346
|
const transcriptPath = transcriptPaths[agentSessionId];
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
347
|
+
let narration = new Map();
|
|
348
|
+
if (!alignmentBroken &&
|
|
349
|
+
!narrationOptedOut &&
|
|
350
|
+
narrationDisabledRepoIds !== null &&
|
|
351
|
+
transcriptPath) {
|
|
352
|
+
narration = await narrateTranscriptActions(transcriptPath, agentSessionId, sessionActions, sessionHarness);
|
|
353
|
+
}
|
|
304
354
|
for (const { entry, id } of pending) {
|
|
305
355
|
const action = toSyncAction(entry, id);
|
|
306
|
-
//
|
|
307
|
-
//
|
|
308
|
-
//
|
|
309
|
-
// is the disclosed default.
|
|
356
|
+
// Keep this final per-action check even though an opted-out repo now
|
|
357
|
+
// withholds narration for the whole session. It also covers a future
|
|
358
|
+
// narrator that can safely partition transcript messages by repo.
|
|
310
359
|
const optedOut = entry.repoId !== undefined && narrationDisabledRepoIds?.has(entry.repoId) === true;
|
|
311
360
|
const entryNarration = optedOut ? undefined : narration.get(id);
|
|
312
361
|
// Spread only when there is something to say. An opted-out repo, an
|
|
@@ -315,9 +364,6 @@ export async function readPendingActions(runsDir, cursors, narrationDisabledRepo
|
|
|
315
364
|
// is byte-for-byte what every shipped CLI sends today.
|
|
316
365
|
actions.push(entryNarration ? { ...action, narration: entryNarration } : action);
|
|
317
366
|
}
|
|
318
|
-
if (sessionSkipped)
|
|
319
|
-
skippedSessions.push(agentSessionId);
|
|
320
|
-
nextCursors[agentSessionId] = lines.length;
|
|
321
367
|
}
|
|
322
368
|
return { actions, cursors: nextCursors, skippedSessions, transcriptPaths };
|
|
323
369
|
}
|
package/dist/action-queue.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"action-queue.js","sourceRoot":"","sources":["../src/action-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"action-queue.js","sourceRoot":"","sources":["../src/action-queue.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAEnD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,sBAAsB,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAA;AAC/C,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAA;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAA;AAW1D,gFAAgF;AAChF,MAAM,iBAAiB,GAAG,GAAG,CAAA;AAE7B,+EAA+E;AAC/E,MAAM,eAAe,GAAG,SAAS,CAAA;AA2BjC;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,iBAAiB,GACrB;IACE,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,WAAW;IAClB,SAAS,EAAE,WAAW;IACtB,YAAY,EAAE,WAAW;IACzB,IAAI,EAAE,WAAW;IACjB,YAAY,EAAE,WAAW;IACzB,IAAI,EAAE,eAAe;IACrB,UAAU,EAAE,eAAe;IAC3B,IAAI,EAAE,QAAQ;IACd,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,YAAY;IACtB,SAAS,EAAE,YAAY;IACvB,KAAK,EAAE,sBAAsB;CAC9B,CAAA;AAEH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,MAAM,KAAK,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAA;IACzC,IAAI,KAAK;QAAE,OAAO,KAAK,CAAA;IAEvB,OAAO,CACL,QAAQ;SACL,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC;SACtC,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,IAAI,SAAS,CACxC,CAAA;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,KAAkB;IAChD,MAAM,KAAK,GAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IACxC,2EAA2E;IAC3E,2EAA2E;IAC3E,0EAA0E;IAC1E,4EAA4E;IAC5E,iCAAiC;IACjC,IAAI,KAAK,CAAC,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACjE,IAAI,KAAK,CAAC,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;IAC9C,IAAI,KAAK,CAAC,OAAO;QAAE,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAA;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC/B,OAAO,OAAO,CAAC,MAAM,GAAG,iBAAiB;QACvC,CAAC,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,iBAAiB,CAAC,GAAG;QAC3C,CAAC,CAAC,OAAO,CAAA;AACb,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,oBAAoB,CAAC,cAAsB,EAAE,SAAiB;IAC5E,OAAO,GAAG,cAAc,IAAI,SAAS,EAAE,CAAA;AACzC,CAAC;AAED,SAAS,YAAY,CAAC,KAAkB,EAAE,EAAU;IAClD,OAAO;QACL,EAAE;QACF,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,YAAY,CAAC,KAAK,CAAC,QAAQ,CAAC;QACxC,OAAO,EAAE,eAAe,CAAC,KAAK,CAAC;QAC/B,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE;QACjD,QAAQ,EAAE;YACR,8EAA8E;YAC9E,wEAAwE;YACxE,yCAAyC;YACzC,UAAU,EAAE,KAAK,CAAC,SAAS;YAC3B,uEAAuE;YACvE,wEAAwE;YACxE,4DAA4D;YAC5D,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9C,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjD,sEAAsE;YACtE,+CAA+C;YAC/C,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1D,qEAAqE;YACrE,kEAAkE;YAClE,wEAAwE;YACxE,0EAA0E;YAC1E,qEAAqE;YACrE,uEAAuE;YACvE,gCAAgC;YAChC,EAAE;YACF,yEAAyE;YACzE,oEAAoE;YACpE,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpD,uEAAuE;YACvE,oEAAoE;YACpE,wEAAwE;YACxE,yDAAyD;YACzD,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACrD;QACD,oEAAoE;KACrE,CAAA;AACH,CAAC;AAED,gFAAgF;AAChF,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAAY;IAClD,IAAI,GAAW,CAAA;IACf,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAY,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QACvC,IAAI,CAAC,MAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YAAE,OAAO,EAAE,CAAA;QAC7E,MAAM,OAAO,GAAkB,EAAE,CAAA;QACjC,KAAK,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;YAC7D,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;gBACvE,OAAO,CAAC,cAAc,CAAC,GAAG,KAAK,CAAA;YACjC,CAAC;QACH,CAAC;QACD,OAAO,OAAO,CAAA;IAChB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAA;IACX,CAAC;AACH,CAAC;AAED,iDAAiD;AACjD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,IAAY,EACZ,OAAsB;IAEtB,MAAM,iBAAiB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACzC,MAAM,SAAS,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;AACxE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAe,EACf,OAAsB,EACtB,2BAAuD,IAAI;AAC3D,8EAA8E;AAC9E,eAAmC;IAEnC,MAAM,OAAO,GAA0B,EAAE,CAAA;IACzC,MAAM,WAAW,GAAkB,EAAE,GAAG,OAAO,EAAE,CAAA;IACjD,MAAM,eAAe,GAAa,EAAE,CAAA;IACpC,MAAM,eAAe,GAA2B,EAAE,CAAA;IAClD,MAAM,QAAQ,GAOR,EAAE,CAAA;IAER,IAAI,KAAe,CAAA;IACnB,IAAI,CAAC;QACH,KAAK,GAAG,CAAC,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAA;IACtE,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,0EAA0E;QAC1E,yEAAyE;QACzE,0EAA0E;QAC1E,sEAAsE;QACtE,IAAK,GAA6B,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtD,OAAO,CAAC,IAAI,CACV,4CAA4C,OAAO,KAAM,GAA6B,EAAE,OAAO,8CAA8C,CAC9I,CAAA;QACH,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,CAAA;IAC5E,CAAC;IAED,KAAK,MAAM,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAChC,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;QACpD,IAAI,GAAW,CAAA;QACf,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,CAAA;QACnD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,uEAAuE;YACvE,yEAAyE;YACzE,+BAA+B;YAC/B,IAAK,GAA6B,EAAE,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACtD,OAAO,CAAC,IAAI,CACV,wCAAwC,IAAI,KAAM,GAA6B,EAAE,OAAO,EAAE,CAC3F,CAAA;YACH,CAAC;YACD,SAAQ;QACV,CAAC;QAED,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAA;QAC3D,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;QAChD,IAAI,KAAK,CAAC,MAAM,IAAI,WAAW;YAAE,SAAQ;QAEzC,yEAAyE;QACzE,yEAAyE;QACzE,uEAAuE;QACvE,sEAAsE;QACtE,sEAAsE;QACtE,oEAAoE;QACpE,wEAAwE;QACxE,8CAA8C;QAC9C,MAAM,cAAc,GAA4B,EAAE,CAAA;QAClD,IAAI,cAAqC,CAAA;QACzC,IAAI,YAAY,GAAG,KAAK,CAAA;QACxB,IAAI,iBAAiB,GAAG,KAAK,CAAA;QAC7B,0EAA0E;QAC1E,0EAA0E;QAC1E,yEAAyE;QACzE,uEAAuE;QACvE,yEAAyE;QACzE,+CAA+C;QAC/C,IAAI,eAAe,GAAG,KAAK,CAAA;QAC3B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACzC,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAA;gBACrD,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,oBAAoB,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;gBACpE,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,cAAc,KAAK,eAAe,EAAE,CAAC;oBAC1D,eAAe,GAAG,IAAI,CAAA;oBACtB,MAAK;gBACP,CAAC;gBACD,cAAc,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,CAAA;gBACjF,IAAI,KAAK,CAAC,MAAM,IAAI,wBAAwB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChE,iBAAiB,GAAG,IAAI,CAAA;gBAC1B,CAAC;gBACD,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;oBAClB,IAAI,cAAc,IAAI,cAAc,KAAK,KAAK,CAAC,OAAO;wBAAE,YAAY,GAAG,IAAI,CAAA;oBAC3E,cAAc,GAAG,KAAK,CAAC,OAAO,CAAA;gBAChC,CAAC;YACH,CAAC;YAAC,MAAM,CAAC;gBACP,eAAe,GAAG,IAAI,CAAA;gBACtB,MAAK;YACP,CAAC;QACH,CAAC;QAED,IAAI,cAAc,GAAG,KAAK,CAAA;QAC1B,MAAM,OAAO,GAAyC,EAAE,CAAA;QACxD,KAAK,IAAI,CAAC,GAAG,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YACnD,IAAI,KAAkB,CAAA;YACtB,IAAI,CAAC;gBACH,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,CAAC,CAAA;YACjD,CAAC;YAAC,MAAM,CAAC;gBACP,SAAQ;YACV,CAAC;YAED,yEAAyE;YACzE,qEAAqE;YACrE,kEAAkE;YAClE,yEAAyE;YACzE,IAAI,KAAK,CAAC,cAAc;gBACtB,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,cAAc,CAAA;YAE9D,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,IAAI,oBAAoB,CAAC,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC,CAAA;YACpE,qEAAqE;YACrE,yEAAyE;YACzE,kDAAkD;YAClD,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,KAAK,CAAC,cAAc,KAAK,eAAe,EAAE,CAAC;gBAC1D,cAAc,GAAG,IAAI,CAAA;gBACrB,SAAQ;YACV,CAAC;YAED,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAA;QAC7B,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC;YACZ,cAAc;YACd,cAAc;YACd,cAAc;YACd,eAAe,EAAE,eAAe,IAAI,YAAY;YAChD,iBAAiB;YACjB,OAAO;SACR,CAAC,CAAA;QACF,IAAI,cAAc;YAAE,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QACxD,WAAW,CAAC,cAAc,CAAC,GAAG,KAAK,CAAC,MAAM,CAAA;IAC5C,CAAC;IAED,2EAA2E;IAC3E,2EAA2E;IAC3E,6EAA6E;IAC7E,IAAI,wBAAwB,KAAK,IAAI,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7D,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;YAC3C,cAAc,EAAE,IAAI;YACpB,UAAU,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC;YAC7D,aAAa,EAAE,eAAe;YAC9B,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACvD,CAAC,CAAA;QACF,IAAI,MAAM,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;YAChC,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;gBAChC,IAAI,IAAI,CAAC,cAAc;oBAAE,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC,IAAI,CAAA;YAC3E,CAAC;QACH,CAAC;IACH,CAAC;IAED,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,MAAM,EACJ,cAAc,EACd,cAAc,EACd,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,OAAO,GACR,GAAG,OAAO,CAAA;QACX,yEAAyE;QACzE,uEAAuE;QACvE,yEAAyE;QACzE,kDAAkD;QAClD,MAAM,cAAc,GAAG,eAAe,CAAC,cAAc,CAAC,CAAA;QACtD,IAAI,SAAS,GAAG,IAAI,GAAG,EAA2B,CAAA;QAClD,IACE,CAAC,eAAe;YAChB,CAAC,iBAAiB;YAClB,wBAAwB,KAAK,IAAI;YACjC,cAAc,EACd,CAAC;YACD,SAAS,GAAG,MAAM,wBAAwB,CACxC,cAAc,EACd,cAAc,EACd,cAAc,EACd,cAAc,CACf,CAAA;QACH,CAAC;QAED,KAAK,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,OAAO,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;YACtC,qEAAqE;YACrE,qEAAqE;YACrE,kEAAkE;YAClE,MAAM,QAAQ,GACZ,KAAK,CAAC,MAAM,KAAK,SAAS,IAAI,wBAAwB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,CAAA;YACpF,MAAM,cAAc,GAAG,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YAC/D,oEAAoE;YACpE,yEAAyE;YACzE,yEAAyE;YACzE,uDAAuD;YACvD,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAA;QAClF,CAAC;IACH,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,eAAe,EAAE,CAAA;AAC5E,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* `mossbear
|
|
2
|
+
* `mossbear comments` — read what people have left about this repo's context.
|
|
3
3
|
*
|
|
4
|
-
* **The on-demand half of the
|
|
5
|
-
* how many
|
|
6
|
-
* is what lets the announcement be capped without ever capping the
|
|
7
|
-
* the cap the hook goes quiet and this command still prints every open
|
|
4
|
+
* **The on-demand half of the comment channel.** The session-start hook announces
|
|
5
|
+
* how many comments are waiting; this is where they are read. Separating the two
|
|
6
|
+
* is what lets the announcement be capped without ever capping the comment: past
|
|
7
|
+
* the cap the hook goes quiet and this command still prints every open comment,
|
|
8
8
|
* because a reader who asked is owed all of them.
|
|
9
9
|
*
|
|
10
10
|
* **A command a person typed always answers.** The hook's silence rule is
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* has anything to say — absence is not a verdict, and all this read can
|
|
14
14
|
* honestly report is that none is waiting here now.
|
|
15
15
|
*/
|
|
16
|
-
export declare const
|
|
16
|
+
export declare const commentsCommand: import("citty").CommandDef<{
|
|
17
17
|
token: {
|
|
18
18
|
type: "string";
|
|
19
19
|
description: string;
|
|
@@ -26,5 +26,11 @@ export declare const notesCommand: import("citty").CommandDef<{
|
|
|
26
26
|
valueHint: string;
|
|
27
27
|
default: string;
|
|
28
28
|
};
|
|
29
|
+
since: {
|
|
30
|
+
type: "string";
|
|
31
|
+
description: string;
|
|
32
|
+
valueHint: string;
|
|
33
|
+
default: string;
|
|
34
|
+
};
|
|
29
35
|
}>;
|
|
30
|
-
//# sourceMappingURL=
|
|
36
|
+
//# sourceMappingURL=comments.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../src/commands/comments.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAaH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;EAoG1B,CAAA"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* `mossbear
|
|
2
|
+
* `mossbear comments` — read what people have left about this repo's context.
|
|
3
3
|
*
|
|
4
|
-
* **The on-demand half of the
|
|
5
|
-
* how many
|
|
6
|
-
* is what lets the announcement be capped without ever capping the
|
|
7
|
-
* the cap the hook goes quiet and this command still prints every open
|
|
4
|
+
* **The on-demand half of the comment channel.** The session-start hook announces
|
|
5
|
+
* how many comments are waiting; this is where they are read. Separating the two
|
|
6
|
+
* is what lets the announcement be capped without ever capping the comment: past
|
|
7
|
+
* the cap the hook goes quiet and this command still prints every open comment,
|
|
8
8
|
* because a reader who asked is owed all of them.
|
|
9
9
|
*
|
|
10
10
|
* **A command a person typed always answers.** The hook's silence rule is
|
|
@@ -15,17 +15,17 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { defineCommand } from 'citty';
|
|
17
17
|
import { resolveDashboardUrl, resolveToken } from '../config.js';
|
|
18
|
-
import {
|
|
19
|
-
import {
|
|
20
|
-
import {
|
|
18
|
+
import { commentScopeForRepo } from '../docs/comments-scope.js';
|
|
19
|
+
import { fetchItemComments } from '../docs/item-comments-client.js';
|
|
20
|
+
import { formatCompactComments } from '../docs/item-comments.js';
|
|
21
21
|
import { errText } from '../err-text.js';
|
|
22
22
|
import { createContextClient } from '../mcp/client.js';
|
|
23
23
|
import { reportNoToken } from '../no-token.js';
|
|
24
24
|
import { resolveRepoRoot } from '../repo-root.js';
|
|
25
|
-
export const
|
|
25
|
+
export const commentsCommand = defineCommand({
|
|
26
26
|
meta: {
|
|
27
|
-
name: '
|
|
28
|
-
description: "Read the
|
|
27
|
+
name: 'comments',
|
|
28
|
+
description: "Read the comments people have left about this repo's context",
|
|
29
29
|
},
|
|
30
30
|
args: {
|
|
31
31
|
token: {
|
|
@@ -40,6 +40,12 @@ export const notesCommand = defineCommand({
|
|
|
40
40
|
valueHint: 'url',
|
|
41
41
|
default: '',
|
|
42
42
|
},
|
|
43
|
+
since: {
|
|
44
|
+
type: 'string',
|
|
45
|
+
description: 'Show comments changed after this cursor',
|
|
46
|
+
valueHint: 'cursor',
|
|
47
|
+
default: '',
|
|
48
|
+
},
|
|
43
49
|
},
|
|
44
50
|
async run({ args }) {
|
|
45
51
|
const token = await resolveToken(args.token).catch(() => '');
|
|
@@ -50,8 +56,8 @@ export const notesCommand = defineCommand({
|
|
|
50
56
|
const dashboardUrl = await resolveDashboardUrl(args.dashboard);
|
|
51
57
|
const root = await resolveRepoRoot(process.cwd());
|
|
52
58
|
const client = createContextClient({ dashboardUrl, token });
|
|
53
|
-
const scope = await
|
|
54
|
-
// Named before the
|
|
59
|
+
const scope = await commentScopeForRepo(client, root);
|
|
60
|
+
// Named before the comments, not instead of them. Half the union still
|
|
55
61
|
// answers, and a reader has to know the other half is missing or a short
|
|
56
62
|
// list reads as the whole truth. Two causes, two sentences, because they
|
|
57
63
|
// have two remedies.
|
|
@@ -59,46 +65,45 @@ export const notesCommand = defineCommand({
|
|
|
59
65
|
console.log(' warning: .mossbear/config.json is malformed, so the bundles this repo subscribes to were skipped. Fix or remove the file.');
|
|
60
66
|
}
|
|
61
67
|
if (scope.unresolved) {
|
|
62
|
-
console.log(` warning: could not reach your account's subscriptions — ${scope.unresolved}. Showing
|
|
68
|
+
console.log(` warning: could not reach your account's subscriptions — ${scope.unresolved}. Showing comments for the bundles this repo commits.`);
|
|
63
69
|
}
|
|
64
70
|
let response;
|
|
65
71
|
try {
|
|
66
|
-
response = await
|
|
72
|
+
response = await fetchItemComments({
|
|
67
73
|
dashboardUrl,
|
|
68
74
|
token,
|
|
69
75
|
bundleIds: scope.bundleIds,
|
|
76
|
+
...(args.since ? { since: args.since } : {}),
|
|
70
77
|
});
|
|
71
78
|
}
|
|
72
79
|
catch (err) {
|
|
73
|
-
console.error(` could not read your
|
|
80
|
+
console.error(` could not read your comments — ${errText(err)}`);
|
|
74
81
|
process.exitCode = 1;
|
|
75
82
|
return;
|
|
76
83
|
}
|
|
77
|
-
if (response.
|
|
84
|
+
if (response.comments.length === 0 && !args.since) {
|
|
78
85
|
// "None is waiting here", never "nobody has anything to say": this read
|
|
79
86
|
// covers the bundles this repo receives, and says so, so a reader whose
|
|
80
87
|
// repo subscribes to nothing can tell that apart from an empty inbox.
|
|
81
|
-
console.log(" No
|
|
88
|
+
console.log(" No comments are waiting about this repo's context.");
|
|
82
89
|
return;
|
|
83
90
|
}
|
|
84
91
|
// The markers' meaning is what makes the delimiters around a body worth
|
|
85
|
-
// anything, so a response carrying
|
|
92
|
+
// anything, so a response carrying comments without it is refused rather than
|
|
86
93
|
// printed bare — and refused out loud. The shared formatter drops such
|
|
87
|
-
//
|
|
94
|
+
// comments silently, which is right where the run has other things to report
|
|
88
95
|
// and wrong here, where dropping them would leave a command somebody typed
|
|
89
96
|
// printing nothing at all.
|
|
90
|
-
if (!response.untrusted) {
|
|
91
|
-
console.error(' could not read your
|
|
97
|
+
if (response.comments.length > 0 && !response.untrusted) {
|
|
98
|
+
console.error(' could not read your comments — the dashboard sent them without saying how their text is delimited. Try again, and update the CLI if it keeps happening.');
|
|
92
99
|
process.exitCode = 1;
|
|
93
100
|
return;
|
|
94
101
|
}
|
|
95
|
-
// Through the same formatter the bundle pull prints, so a
|
|
102
|
+
// Through the same formatter the bundle pull prints, so a comment reads
|
|
96
103
|
// identically whichever way a reader met it — and so the marker rules
|
|
97
104
|
// (bodies byte for byte, at column 0, inside the markers the server
|
|
98
105
|
// derived) are held in one place rather than two.
|
|
99
|
-
|
|
100
|
-
for (const line of lines)
|
|
101
|
-
console.log(line);
|
|
106
|
+
console.log(formatCompactComments(response.comments, response.cursor ?? '', response.untrusted, Boolean(args.since)));
|
|
102
107
|
},
|
|
103
108
|
});
|
|
104
|
-
//# sourceMappingURL=
|
|
109
|
+
//# sourceMappingURL=comments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../src/commands/comments.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/commands/link.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;
|
|
1
|
+
{"version":3,"file":"link.d.ts","sourceRoot":"","sources":["../../src/commands/link.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAiFH;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,6BAA6B,4EACiC,CAAA;AA4S3E,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAMtB,CAAA;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAYxB,CAAA"}
|
package/dist/commands/link.js
CHANGED
|
@@ -39,7 +39,7 @@ import { discoverGuideFiles } from '../rules/discover.js';
|
|
|
39
39
|
import { resolveGlobalFlag } from '../rules/global-flag.js';
|
|
40
40
|
import { adoptable, managed, overriddenTombstoneKeys, resolveImportCandidates, tombstoned, } from '../rules/import-candidates.js';
|
|
41
41
|
import { resolveNamedPaths } from '../rules/import-paths.js';
|
|
42
|
-
import { formatCandidateDetail, formatCandidateLines, managedFootnote, parseSelection, selectionPrompt, tombstoneFootnote, } from '../rules/import-picker.js';
|
|
42
|
+
import { formatCandidateDetail, formatCandidateLines, managedFootnote, parseSelection, reenrollableTombstoneFootnote, reenrollFootnote, selectionPrompt, tombstoneFootnote, } from '../rules/import-picker.js';
|
|
43
43
|
import { formatImportFailure, formatImportSummary, guideImportConflicts, importDiscoveredGuides, landedCandidates, resolveGuideImportConflicts, } from '../rules/init-import.js';
|
|
44
44
|
/**
|
|
45
45
|
* Ask which of the adoptable candidates to send.
|
|
@@ -189,9 +189,19 @@ async function runAdopt(args) {
|
|
|
189
189
|
const footnote = choosable.length > 0 ? managedFootnote(candidates) : null;
|
|
190
190
|
if (footnote)
|
|
191
191
|
console.log(`\n${footnote}`);
|
|
192
|
-
const
|
|
192
|
+
const notChoosable = candidates.filter((candidate) => candidate.tombstone !== null && !choosableSet.has(candidate));
|
|
193
|
+
const tombstoneNote = tombstoneFootnote(notChoosable);
|
|
193
194
|
if (tombstoneNote)
|
|
194
195
|
console.log(`\n${tombstoneNote}`);
|
|
196
|
+
const reenrollableTombstoneNote = reenrollableTombstoneFootnote(notChoosable);
|
|
197
|
+
if (reenrollableTombstoneNote)
|
|
198
|
+
console.log(`\n${reenrollableTombstoneNote}`);
|
|
199
|
+
// Unlike the two footnotes above, these rows are already in `choosable` —
|
|
200
|
+
// the footnote explains what a bare Enter is about to do, so every one
|
|
201
|
+
// counts.
|
|
202
|
+
const reenrollNote = reenrollFootnote(candidates);
|
|
203
|
+
if (reenrollNote)
|
|
204
|
+
console.log(`\n${reenrollNote}`);
|
|
195
205
|
console.log('');
|
|
196
206
|
if (choosable.length === 0) {
|
|
197
207
|
// The named-path case reaches here too, and this is the legible refusal
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../src/commands/link.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"link.js","sourceRoot":"","sources":["../../src/commands/link.ts"],"names":[],"mappings":"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"}
|
package/dist/commands/pull.js
CHANGED
|
@@ -6,7 +6,7 @@ import { resolveDashboardUrl, resolveToken } from '../config.js';
|
|
|
6
6
|
import { defaultPullDir, pullBundleToDir } from '../context/pull.js';
|
|
7
7
|
import { bundleNameFailureMessage, resolveBundleByName, } from '../docs/bundle-by-name.js';
|
|
8
8
|
import { withDistinctDirNames } from '../docs/delivery.js';
|
|
9
|
-
import {
|
|
9
|
+
import { dedupeDeliveredComments, formatItemCommentLines, } from '../docs/item-comments.js';
|
|
10
10
|
import { readRepoDocsConfig, readRepoProjectId } from '../docs/repo-config.js';
|
|
11
11
|
import { parseSelectionInput, subscribeBundleSelections, } from '../docs/subscribe.js';
|
|
12
12
|
import { formatDocsRetirementLines, formatDocsSyncLine, syncSubscribedDocs, } from '../docs/sync-docs.js';
|
|
@@ -357,8 +357,8 @@ export const pullCommand = defineCommand({
|
|
|
357
357
|
console.log(retirementLines.join('\n'));
|
|
358
358
|
// A person driving the CLI by hand is not the one reader who cannot see
|
|
359
359
|
// what was left for them. Same lines the session-start sync prints, and
|
|
360
|
-
// nothing at all when there are no
|
|
361
|
-
for (const line of
|
|
360
|
+
// nothing at all when there are no comments.
|
|
361
|
+
for (const line of formatItemCommentLines(result.comments)) {
|
|
362
362
|
console.log(line);
|
|
363
363
|
}
|
|
364
364
|
if (result.hadError)
|
|
@@ -413,8 +413,8 @@ async function exportBundles(client, bundles, options) {
|
|
|
413
413
|
let anyFailed = false;
|
|
414
414
|
// Gathered across every exported bundle and printed once at the end, for the
|
|
415
415
|
// same reason the subscribing path dedupes: two bundles can carry the item a
|
|
416
|
-
//
|
|
417
|
-
const
|
|
416
|
+
// comment is about, and the person wrote one comment.
|
|
417
|
+
const comments = [];
|
|
418
418
|
for (const bundle of bundles) {
|
|
419
419
|
const dir = options.customOut || defaultPullDir(bundle.dirName, options.cwd);
|
|
420
420
|
try {
|
|
@@ -441,7 +441,7 @@ async function exportBundles(client, bundles, options) {
|
|
|
441
441
|
for (const skipped of result.skipped) {
|
|
442
442
|
console.warn(` warning: ${skipped.file} was not written — ${skipped.detail}`);
|
|
443
443
|
}
|
|
444
|
-
|
|
444
|
+
comments.push(...result.comments);
|
|
445
445
|
}
|
|
446
446
|
catch (err) {
|
|
447
447
|
anyFailed = true;
|
|
@@ -450,9 +450,9 @@ async function exportBundles(client, bundles, options) {
|
|
|
450
450
|
}
|
|
451
451
|
console.log('Exported without subscribing — `mossbear refresh` will not keep these fresh. Run `mossbear pull <bundle>` without --once to subscribe.');
|
|
452
452
|
// A one-off export is still a read the server counted as a delivery, so the
|
|
453
|
-
//
|
|
454
|
-
// way to make a
|
|
455
|
-
for (const line of
|
|
453
|
+
// comments it served are printed here too. Without this the flag was the one
|
|
454
|
+
// way to make a comment's `delivered_count` climb while nobody was shown it.
|
|
455
|
+
for (const line of formatItemCommentLines(dedupeDeliveredComments(comments))) {
|
|
456
456
|
console.log(line);
|
|
457
457
|
}
|
|
458
458
|
return anyFailed;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../src/commands/pull.ts"],"names":[],"mappings":"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"}
|
package/dist/context/pull.d.ts
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
*
|
|
20
20
|
* Kept free of citty/console so it unit-tests directly against a mocked client.
|
|
21
21
|
*/
|
|
22
|
-
import { type
|
|
22
|
+
import { type DeliveredItemComment } from '../docs/item-comments.js';
|
|
23
23
|
import type { ContextClient, PullContextParams } from '../mcp/client.js';
|
|
24
24
|
import type { SkippedWrite, WriteItemsDeps } from '../mcp/write-items.js';
|
|
25
25
|
import type { ContextItem } from '@mossbear/protocol';
|
|
@@ -44,14 +44,14 @@ export type PullBundleResult = {
|
|
|
44
44
|
*/
|
|
45
45
|
skipped: SkippedWrite[];
|
|
46
46
|
/**
|
|
47
|
-
*
|
|
47
|
+
* Comments the server served with these items.
|
|
48
48
|
*
|
|
49
49
|
* Carried out of here because this response has already been counted as a
|
|
50
|
-
* delivery: the route bumps `delivered_count` for every
|
|
50
|
+
* delivery: the route bumps `delivered_count` for every comment it puts on the
|
|
51
51
|
* wire, so an export that dropped them would leave the dashboard telling the
|
|
52
52
|
* person who wrote one that it reached an agent it never reached.
|
|
53
53
|
*/
|
|
54
|
-
|
|
54
|
+
comments: DeliveredItemComment[];
|
|
55
55
|
};
|
|
56
56
|
/**
|
|
57
57
|
* Turn a bundle slug into a safe single path segment for the default output
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/context/pull.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,
|
|
1
|
+
{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/context/pull.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAIH,OAAO,EAEL,KAAK,oBAAoB,EAC1B,MAAM,0BAA0B,CAAA;AAGjC,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAErD;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,GAAG;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CAAA;AAEzE,MAAM,MAAM,gBAAgB,GAAG;IAC7B,uFAAuF;IACvF,KAAK,EAAE,SAAS,WAAW,EAAE,CAAA;IAC7B,8EAA8E;IAC9E,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB;;;;;OAKG;IACH,OAAO,EAAE,YAAY,EAAE,CAAA;IACvB;;;;;;;OAOG;IACH,QAAQ,EAAE,oBAAoB,EAAE,CAAA;CACjC,CAAA;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAExD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAElE;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,gBAAgB,EACxB,GAAG,EAAE,MAAM,EACX,IAAI,GAAE,cAAmB,GACxB,OAAO,CAAC,gBAAgB,CAAC,CAwB3B"}
|