@proletariat/cli 0.3.112 → 0.3.114
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/orchestrate/index.js +11 -2
- package/dist/commands/orchestrate/index.js.map +1 -1
- package/dist/commands/pr/merge.js +44 -80
- package/dist/commands/pr/merge.js.map +1 -1
- package/dist/commands/work/start.js +30 -0
- package/dist/commands/work/start.js.map +1 -1
- package/dist/hooks/init.js +14 -1
- package/dist/hooks/init.js.map +1 -1
- package/dist/lib/events/events.d.ts +19 -0
- package/dist/lib/execution/devcontainer.js +26 -2
- package/dist/lib/execution/devcontainer.js.map +1 -1
- package/dist/lib/execution/prompt-watcher.d.ts +120 -0
- package/dist/lib/execution/prompt-watcher.js +222 -0
- package/dist/lib/execution/prompt-watcher.js.map +1 -0
- package/dist/lib/execution/runners/devcontainer-tmux.js +14 -0
- package/dist/lib/execution/runners/devcontainer-tmux.js.map +1 -1
- package/dist/lib/execution/runners/devcontainer.js +5 -1
- package/dist/lib/execution/runners/devcontainer.js.map +1 -1
- package/dist/lib/execution/runners/docker-credentials.d.ts +13 -0
- package/dist/lib/execution/runners/docker-credentials.js +55 -0
- package/dist/lib/execution/runners/docker-credentials.js.map +1 -1
- package/dist/lib/execution/runners/docker-management.d.ts +7 -0
- package/dist/lib/execution/runners/docker-management.js +38 -4
- package/dist/lib/execution/runners/docker-management.js.map +1 -1
- package/dist/lib/execution/runners/shared.d.ts +2 -2
- package/dist/lib/execution/runners/shared.js +2 -2
- package/dist/lib/execution/runners/shared.js.map +1 -1
- package/dist/lib/execution/spawner.js +31 -0
- package/dist/lib/execution/spawner.js.map +1 -1
- package/dist/lib/orchestrate/index.d.ts +1 -1
- package/dist/lib/orchestrate/index.js +1 -1
- package/dist/lib/orchestrate/index.js.map +1 -1
- package/dist/lib/orchestrate/llm-agent.d.ts +7 -0
- package/dist/lib/orchestrate/llm-agent.js +48 -1
- package/dist/lib/orchestrate/llm-agent.js.map +1 -1
- package/dist/lib/pr/index.d.ts +9 -0
- package/dist/lib/pr/index.js +46 -0
- package/dist/lib/pr/index.js.map +1 -1
- package/dist/lib/reconcile/index.d.ts +7 -2
- package/dist/lib/reconcile/index.js +130 -8
- package/dist/lib/reconcile/index.js.map +1 -1
- package/dist/lib/reconcile/types.d.ts +18 -1
- package/dist/lib/update-check.d.ts +39 -0
- package/dist/lib/update-check.js +139 -0
- package/dist/lib/update-check.js.map +1 -1
- package/oclif.manifest.json +675 -675
- package/package.json +1 -1
|
@@ -232,6 +232,7 @@ export default class Orchestrate extends PromptCommand {
|
|
|
232
232
|
this.log(styles.muted(` ${hookCount} active hooks`));
|
|
233
233
|
}
|
|
234
234
|
catch { /* hook count is cosmetic — db may not have pmo_work_hooks table yet */ }
|
|
235
|
+
this.log(styles.muted(' LLM agent (tier 2) active — daemon decisions have a brain'));
|
|
235
236
|
if (parsedFlags['poll-interval'] && parsedFlags['poll-interval'] > 0) {
|
|
236
237
|
this.log(styles.muted(` Polling every ${parsedFlags['poll-interval']}s for external events`));
|
|
237
238
|
}
|
|
@@ -258,8 +259,16 @@ export default class Orchestrate extends PromptCommand {
|
|
|
258
259
|
this.log(styles.error(` Failed to start poller: ${err instanceof Error ? err.message : String(err)}`));
|
|
259
260
|
}
|
|
260
261
|
}
|
|
261
|
-
// Keep Node.js event loop alive
|
|
262
|
-
|
|
262
|
+
// Keep Node.js event loop alive and periodically check for timed-out
|
|
263
|
+
// LLM decisions. Even with onLlmDecision wired, this is a safety net:
|
|
264
|
+
// if the callback throws or is slow, queued decisions can accumulate.
|
|
265
|
+
// Every 60s, escalate any LLM decisions that exceeded their timeout.
|
|
266
|
+
const keepAlive = setInterval(() => {
|
|
267
|
+
const escalated = engine.escalateTimedOutLlmDecisions();
|
|
268
|
+
if (escalated > 0) {
|
|
269
|
+
logFn(`[daemon] Escalated ${escalated} timed-out LLM decision(s) to human tier`);
|
|
270
|
+
}
|
|
271
|
+
}, 60_000);
|
|
263
272
|
// Keep the process alive until signal
|
|
264
273
|
await new Promise((resolve) => {
|
|
265
274
|
const cleanup = () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/orchestrate/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/orchestrate/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
import { Args, Flags } from '@oclif/core';
|
|
2
2
|
import { PMOCommand, pmoBaseFlags, } from '../../lib/pmo/index.js';
|
|
3
|
-
import { getWorkColumnSetting, findColumnByName } from '../../lib/work-lifecycle/settings.js';
|
|
4
3
|
import { styles } from '../../lib/styles.js';
|
|
5
|
-
import { requireGhCli, getPRByNumber, listOpenPRs, mergePR,
|
|
4
|
+
import { requireGhCli, getPRByNumber, listOpenPRs, mergePR, } from '../../lib/pr/index.js';
|
|
6
5
|
import { shouldOutputJson, outputErrorAsJson, outputSuccessAsJson, createMetadata, } from '../../lib/prompt-json.js';
|
|
7
6
|
import { FlagResolver } from '../../lib/flags/index.js';
|
|
8
|
-
import { getEventBus } from '../../lib/events/event-bus.js';
|
|
9
7
|
import { validateBranchName } from '../../lib/branch/index.js';
|
|
10
8
|
import { PMO_TABLES } from '../../lib/pmo/schema.js';
|
|
11
9
|
import { getWorkspaceInfo } from '../../lib/agents/commands.js';
|
|
@@ -100,84 +98,56 @@ export default class PRMerge extends PMOCommand {
|
|
|
100
98
|
if (prInfo.state !== 'OPEN') {
|
|
101
99
|
return handleError('PR_NOT_OPEN', `PR #${prNumber} is ${prInfo.state.toLowerCase()}, not open.`);
|
|
102
100
|
}
|
|
103
|
-
//
|
|
104
|
-
|
|
105
|
-
const result = mergePR(prNumber, {
|
|
106
|
-
method,
|
|
107
|
-
deleteBranch: flags['delete-branch'],
|
|
108
|
-
admin: flags.admin,
|
|
109
|
-
cwd: repoCwd,
|
|
110
|
-
});
|
|
111
|
-
if (!result.success) {
|
|
112
|
-
return handleError('MERGE_FAILED', `Failed to merge PR #${prNumber}: ${result.error}`);
|
|
113
|
-
}
|
|
114
|
-
// After successful merge, resolve the linked ticket and move it to Done
|
|
115
|
-
let linkedTicketId;
|
|
116
|
-
let ticketMovedToDone = false;
|
|
117
|
-
let ticketTransitionProvider;
|
|
101
|
+
// --- Check if PR is linked to a ticket BEFORE merging ---
|
|
102
|
+
// If linked, delegate to work:ship for full lifecycle (merge, transition, cleanup, rebase siblings, hooks)
|
|
118
103
|
if (this.hasPMO) {
|
|
119
104
|
try {
|
|
120
105
|
const linkedTicket = await this.resolveLinkedTicket(prNumber, prInfo.headBranch, flags.project);
|
|
121
106
|
if (linkedTicket) {
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
? await this.storage.getProjectBoard(linkedTicket.projectId)
|
|
136
|
-
: null;
|
|
137
|
-
const columnNames = board ? board.columns.map(col => col.name) : [];
|
|
138
|
-
const doneColumn = findColumnByName(columnNames, targetColumnName);
|
|
139
|
-
if (doneColumn && linkedTicket.projectId) {
|
|
140
|
-
// Move in local PMO
|
|
141
|
-
await this.storage.moveTicket(linkedTicket.projectId, linkedTicket.id, doneColumn);
|
|
142
|
-
ticketMovedToDone = true;
|
|
143
|
-
// Sync to external provider (e.g., Linear)
|
|
144
|
-
const provider = await this.resolveTicketProvider(linkedTicket.id, linkedTicket.projectId);
|
|
145
|
-
if (provider.name !== 'pmo') {
|
|
146
|
-
const moveResult = await provider.moveTicket(linkedTicket.id, doneColumn);
|
|
147
|
-
if (moveResult.success) {
|
|
148
|
-
ticketTransitionProvider = moveResult.provider;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
}
|
|
107
|
+
const ticketDisplayId = linkedTicket.metadata?.external_key || linkedTicket.id;
|
|
108
|
+
if (!jsonMode) {
|
|
109
|
+
this.log('');
|
|
110
|
+
this.log(styles.info(`PR #${prNumber} is linked to ${ticketDisplayId} — running full ship lifecycle`));
|
|
111
|
+
}
|
|
112
|
+
// Build args for work:ship --pr <num>
|
|
113
|
+
const shipArgs = ['--pr', String(prNumber)];
|
|
114
|
+
shipArgs.push('--method', flags.method);
|
|
115
|
+
if (!flags['delete-branch']) {
|
|
116
|
+
shipArgs.push('--no-delete-branch');
|
|
117
|
+
}
|
|
118
|
+
if (flags.admin) {
|
|
119
|
+
shipArgs.push('--admin');
|
|
152
120
|
}
|
|
153
|
-
|
|
154
|
-
|
|
121
|
+
if (flags.project) {
|
|
122
|
+
shipArgs.push('--project', flags.project);
|
|
155
123
|
}
|
|
124
|
+
if (jsonMode) {
|
|
125
|
+
shipArgs.push('--json');
|
|
126
|
+
}
|
|
127
|
+
// Delegate to work:ship which handles the full lifecycle
|
|
128
|
+
await this.config.runCommand('work:ship', shipArgs);
|
|
129
|
+
return;
|
|
156
130
|
}
|
|
157
131
|
}
|
|
158
|
-
catch (err) {
|
|
159
|
-
this.warn(`Failed to resolve linked ticket: ${err instanceof Error ? err.message : err}`);
|
|
160
|
-
}
|
|
161
|
-
}
|
|
162
|
-
// Emit work:pr_merged event for outbound sync (e.g., Linear auto-transition)
|
|
163
|
-
if (linkedTicketId) {
|
|
164
|
-
try {
|
|
165
|
-
const repo = getGitHubRepo(repoCwd);
|
|
166
|
-
const prUrl = repo ? `https://github.com/${repo}/pull/${prNumber}` : null;
|
|
167
|
-
getEventBus().emit('work:pr_merged', {
|
|
168
|
-
workItemId: linkedTicketId,
|
|
169
|
-
source: 'github',
|
|
170
|
-
prNumber,
|
|
171
|
-
prTitle: prInfo.title,
|
|
172
|
-
prUrl,
|
|
173
|
-
mergeMethod: method,
|
|
174
|
-
timestamp: new Date(),
|
|
175
|
-
});
|
|
176
|
-
}
|
|
177
132
|
catch {
|
|
178
|
-
//
|
|
133
|
+
// If ticket resolution fails, fall through to simple merge
|
|
179
134
|
}
|
|
180
135
|
}
|
|
136
|
+
// --- No linked ticket — simple merge (no lifecycle) ---
|
|
137
|
+
if (!jsonMode) {
|
|
138
|
+
this.log('');
|
|
139
|
+
this.log(styles.info(`PR #${prNumber} has no linked ticket — merging directly`));
|
|
140
|
+
}
|
|
141
|
+
const method = flags.method;
|
|
142
|
+
const result = mergePR(prNumber, {
|
|
143
|
+
method,
|
|
144
|
+
deleteBranch: flags['delete-branch'],
|
|
145
|
+
admin: flags.admin,
|
|
146
|
+
cwd: repoCwd,
|
|
147
|
+
});
|
|
148
|
+
if (!result.success) {
|
|
149
|
+
return handleError('MERGE_FAILED', `Failed to merge PR #${prNumber}: ${result.error}`);
|
|
150
|
+
}
|
|
181
151
|
if (jsonMode) {
|
|
182
152
|
outputSuccessAsJson({
|
|
183
153
|
merged: true,
|
|
@@ -185,25 +155,19 @@ export default class PRMerge extends PMOCommand {
|
|
|
185
155
|
title: prInfo.title,
|
|
186
156
|
method,
|
|
187
157
|
branchDeleted: flags['delete-branch'],
|
|
188
|
-
linkedTicket:
|
|
189
|
-
ticketMovedToDone,
|
|
190
|
-
ticketTransitionProvider:
|
|
158
|
+
linkedTicket: null,
|
|
159
|
+
ticketMovedToDone: false,
|
|
160
|
+
ticketTransitionProvider: null,
|
|
161
|
+
delegatedToWorkShip: false,
|
|
191
162
|
}, createMetadata('pr merge', flags));
|
|
192
163
|
return;
|
|
193
164
|
}
|
|
194
|
-
this.log('');
|
|
195
165
|
this.log(styles.success(`PR #${prNumber} merged successfully!`));
|
|
196
166
|
this.log(styles.muted(` Title: ${prInfo.title}`));
|
|
197
167
|
this.log(styles.muted(` Method: ${method}`));
|
|
198
168
|
if (flags['delete-branch']) {
|
|
199
169
|
this.log(styles.muted(` Branch ${prInfo.headBranch} deleted`));
|
|
200
170
|
}
|
|
201
|
-
if (linkedTicketId) {
|
|
202
|
-
this.log(styles.muted(` Ticket ${linkedTicketId} → Done`));
|
|
203
|
-
if (ticketTransitionProvider) {
|
|
204
|
-
this.log(styles.muted(` Synced to ${ticketTransitionProvider}`));
|
|
205
|
-
}
|
|
206
|
-
}
|
|
207
171
|
}
|
|
208
172
|
/**
|
|
209
173
|
* Resolve a repo-level cwd for gh CLI commands.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/commands/pr/merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EACL,UAAU,EACV,YAAY,GACb,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../src/commands/pr/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,6 +37,8 @@ import { loadDefaultWorkSource, getConnectedIntegrations, isLocalTicketId, } fro
|
|
|
37
37
|
import { pruneWorktrees, checkoutBranchSafe } from '../../lib/branch/index.js';
|
|
38
38
|
import { handlePostExecutionTransition } from '../../lib/work-lifecycle/index.js';
|
|
39
39
|
import { runPreflightChecks, formatPreflightReport } from '../../lib/execution/preflight.js';
|
|
40
|
+
import { startPromptWatcher } from '../../lib/execution/prompt-watcher.js';
|
|
41
|
+
import { getEventBus } from '../../lib/events/event-bus.js';
|
|
40
42
|
/**
|
|
41
43
|
* Try to execute a git command, return true if successful
|
|
42
44
|
*/
|
|
@@ -2326,6 +2328,34 @@ export default class WorkStart extends PMOCommand {
|
|
|
2326
2328
|
currentExecutionId: execution.id,
|
|
2327
2329
|
});
|
|
2328
2330
|
}
|
|
2331
|
+
// PRLT-1281: Start prompt watcher to auto-dismiss plugin onboarding prompts
|
|
2332
|
+
if (result.sessionId) {
|
|
2333
|
+
const eventBus = getEventBus();
|
|
2334
|
+
startPromptWatcher(result.sessionId, {
|
|
2335
|
+
containerId: result.containerId,
|
|
2336
|
+
log: (msg) => { if (!jsonMode)
|
|
2337
|
+
this.log(styles.muted(msg)); },
|
|
2338
|
+
onDismiss: (dismissResult) => {
|
|
2339
|
+
eventBus.emit('prompt:auto_dismissed', {
|
|
2340
|
+
sessionId: result.sessionId,
|
|
2341
|
+
patternName: dismissResult.pattern.name,
|
|
2342
|
+
matchedText: dismissResult.matchedText,
|
|
2343
|
+
selectedAnswer: dismissResult.selectedAnswer,
|
|
2344
|
+
success: dismissResult.success,
|
|
2345
|
+
error: dismissResult.error,
|
|
2346
|
+
timestamp: new Date(),
|
|
2347
|
+
});
|
|
2348
|
+
},
|
|
2349
|
+
onEscalate: (escalation) => {
|
|
2350
|
+
eventBus.emit('prompt:escalated', {
|
|
2351
|
+
sessionId: result.sessionId,
|
|
2352
|
+
paneContent: escalation.paneContent,
|
|
2353
|
+
reason: escalation.reason,
|
|
2354
|
+
timestamp: new Date(),
|
|
2355
|
+
});
|
|
2356
|
+
},
|
|
2357
|
+
});
|
|
2358
|
+
}
|
|
2329
2359
|
// Update ticket assignee ONLY after successful spawn
|
|
2330
2360
|
// For external-only tickets, update ticket_ref instead of PMO storage
|
|
2331
2361
|
if (!ticket.assignee || ticket.assignee !== assignedAgent) {
|