@staff0rd/assist 0.1115.0 → 0.1116.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/built-version +1 -1
- package/dist/commands/sessions/web/bundle.js +412 -412
- package/dist/index.js +199 -147
- 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.1116.0",
|
|
10
10
|
type: "module",
|
|
11
11
|
main: "dist/index.js",
|
|
12
12
|
bin: {
|
|
@@ -772,7 +772,10 @@ var DEFAULT_BACKUP_DIR = "~/.assist/backups";
|
|
|
772
772
|
var DEFAULT_BACKUP_STALE_AFTER = "32h";
|
|
773
773
|
var DEFAULT_CLONE_DIR = "~/git";
|
|
774
774
|
var harnessKindSchema = z6.enum(harnessKinds);
|
|
775
|
-
var sessionTypeDefaultsSchema = z6.strictObject({
|
|
775
|
+
var sessionTypeDefaultsSchema = z6.strictObject({
|
|
776
|
+
harness: harnessKindSchema.optional(),
|
|
777
|
+
model: z6.string().min(1).optional()
|
|
778
|
+
}).optional();
|
|
776
779
|
var assistConfigShape = {
|
|
777
780
|
advice: z6.strictObject({
|
|
778
781
|
sections: z6.partialRecord(z6.enum(adviceFragmentNames), z6.boolean()).default({}),
|
|
@@ -5325,6 +5328,7 @@ function buildArgs(opts) {
|
|
|
5325
5328
|
if (opts.appendSystemPromptFile)
|
|
5326
5329
|
base.push("--append-system-prompt-file", opts.appendSystemPromptFile);
|
|
5327
5330
|
if (opts.auto) base.push("--permission-mode", "auto");
|
|
5331
|
+
if (opts.model) base.push("--model", opts.model);
|
|
5328
5332
|
if (opts.resumeSessionId) {
|
|
5329
5333
|
return opts.prompt ? [...base, "--resume", opts.resumeSessionId, opts.prompt] : [...base, "--resume", opts.resumeSessionId];
|
|
5330
5334
|
}
|
|
@@ -7066,7 +7070,8 @@ var claudeAdapter = {
|
|
|
7066
7070
|
prompt,
|
|
7067
7071
|
cwd,
|
|
7068
7072
|
appendSystemPromptFile,
|
|
7069
|
-
auto
|
|
7073
|
+
auto,
|
|
7074
|
+
model
|
|
7070
7075
|
}) => spawnClaude({
|
|
7071
7076
|
prompt,
|
|
7072
7077
|
cwd,
|
|
@@ -7074,7 +7079,8 @@ var claudeAdapter = {
|
|
|
7074
7079
|
resumeSessionId: resumeId,
|
|
7075
7080
|
claudeSessionId: conversationId,
|
|
7076
7081
|
appendSystemPromptFile,
|
|
7077
|
-
auto
|
|
7082
|
+
auto,
|
|
7083
|
+
model
|
|
7078
7084
|
}),
|
|
7079
7085
|
oneShot: claudeOneShot,
|
|
7080
7086
|
structured: claudeStructuredRun,
|
|
@@ -7292,7 +7298,7 @@ function spawnCodex(opts = {}) {
|
|
|
7292
7298
|
if (trusted) daemonLog(`codex: trusted ${trusted} in config.toml`);
|
|
7293
7299
|
const untrusted = prepareCodexHookTrust();
|
|
7294
7300
|
if (untrusted) daemonLog(`codex: ${untrusted}`);
|
|
7295
|
-
const override = buildHarnessCodexArgs();
|
|
7301
|
+
const override = opts.model ? { args: ["-m", opts.model], env: {} } : buildHarnessCodexArgs();
|
|
7296
7302
|
const sessionEnv = codexSessionEnvArgs({
|
|
7297
7303
|
ASSIST_SESSION: "1",
|
|
7298
7304
|
ASSIST_SESSION_ID: opts.sessionId,
|
|
@@ -8194,12 +8200,20 @@ var codexAdapter = {
|
|
|
8194
8200
|
sandbox: sandbox(allowEdits),
|
|
8195
8201
|
resumeSessionId: conversationId
|
|
8196
8202
|
}),
|
|
8197
|
-
interactive: ({
|
|
8203
|
+
interactive: ({
|
|
8204
|
+
sessionId: sessionId2,
|
|
8205
|
+
resumeId,
|
|
8206
|
+
prompt,
|
|
8207
|
+
cwd,
|
|
8208
|
+
appendSystemPromptFile,
|
|
8209
|
+
model
|
|
8210
|
+
}) => spawnCodex({
|
|
8198
8211
|
prompt,
|
|
8199
8212
|
cwd,
|
|
8200
8213
|
sessionId: sessionId2,
|
|
8201
8214
|
resumeSessionId: resumeId,
|
|
8202
|
-
appendSystemPromptFile
|
|
8215
|
+
appendSystemPromptFile,
|
|
8216
|
+
model
|
|
8203
8217
|
}),
|
|
8204
8218
|
oneShot: codexOneShot,
|
|
8205
8219
|
structured: codexStructuredRun,
|
|
@@ -8214,6 +8228,7 @@ var piTerminalArgs = ["--tui-mode", "regular"];
|
|
|
8214
8228
|
// src/commands/sessions/daemon/spawnPi.ts
|
|
8215
8229
|
function spawnPi(opts = {}) {
|
|
8216
8230
|
const args = ["pi", ...piTerminalArgs];
|
|
8231
|
+
if (opts.model) args.push("--model", opts.model);
|
|
8217
8232
|
if (opts.prompt) args.push(opts.prompt);
|
|
8218
8233
|
return spawnPty(args, opts.cwd, opts.sessionId, { ASSIST_HARNESS: "pi" });
|
|
8219
8234
|
}
|
|
@@ -8294,7 +8309,7 @@ var piAdapter = {
|
|
|
8294
8309
|
launchSkill: (skill, args, { cwd }) => spawnPi2(buildSlashCommand(skill, args), { cwd }),
|
|
8295
8310
|
launchPrompt: (prompt, { cwd }) => spawnPi2(prompt, { cwd }),
|
|
8296
8311
|
resume: cannotResume,
|
|
8297
|
-
interactive: ({ sessionId: sessionId2, resumeId, prompt, cwd }) => resumeId ? cannotResume() : spawnPi({ prompt, cwd, sessionId: sessionId2 }),
|
|
8312
|
+
interactive: ({ sessionId: sessionId2, resumeId, prompt, cwd, model }) => resumeId ? cannotResume() : spawnPi({ prompt, cwd, sessionId: sessionId2, model }),
|
|
8298
8313
|
oneShot: noOneShot,
|
|
8299
8314
|
structured: noOneShot,
|
|
8300
8315
|
connectorRun: rejectConnectorRun("pi"),
|
|
@@ -9893,11 +9908,18 @@ var launches = {
|
|
|
9893
9908
|
};
|
|
9894
9909
|
var harnessDefaultsConfigHelp = Object.entries(
|
|
9895
9910
|
launches
|
|
9896
|
-
).
|
|
9897
|
-
|
|
9898
|
-
|
|
9899
|
-
|
|
9900
|
-
}
|
|
9911
|
+
).flatMap(([type, launch]) => [
|
|
9912
|
+
{
|
|
9913
|
+
key: `harness.defaults.${type}.harness`,
|
|
9914
|
+
setter: `assist config set harness.defaults.${type}.harness <claude|codex|pi>`,
|
|
9915
|
+
note: `harness for ${launch} when none is picked; unset falls back to harness.engine`
|
|
9916
|
+
},
|
|
9917
|
+
{
|
|
9918
|
+
key: `harness.defaults.${type}.model`,
|
|
9919
|
+
setter: `assist config set harness.defaults.${type}.model <model>`,
|
|
9920
|
+
note: `model for ${launch} on the type's harness; unset uses the harness's own default`
|
|
9921
|
+
}
|
|
9922
|
+
]);
|
|
9901
9923
|
|
|
9902
9924
|
// src/commands/inbox/inboxConfigHelp.ts
|
|
9903
9925
|
var inboxConfigHelp = [
|
|
@@ -15164,7 +15186,7 @@ async function revertDiffPaths(req, res) {
|
|
|
15164
15186
|
// src/commands/sessions/web/newSessionDefaults/resolveDialogHarnesses.ts
|
|
15165
15187
|
var harnessShape = assistConfigSchema.shape.harness.unwrap().shape;
|
|
15166
15188
|
var engineSchema = harnessShape.engine;
|
|
15167
|
-
var
|
|
15189
|
+
var typeShape = harnessShape.defaults.unwrap().shape.draft.unwrap().shape;
|
|
15168
15190
|
var dialogTypes = ["draft", "bug", "prompt", "design"];
|
|
15169
15191
|
function child(value, key) {
|
|
15170
15192
|
if (!value || typeof value !== "object") return void 0;
|
|
@@ -15176,14 +15198,17 @@ function resolveDialogHarnesses(raw) {
|
|
|
15176
15198
|
if (!engine.success) return { error: "harness.engine" };
|
|
15177
15199
|
const defaults = child(harness, "defaults");
|
|
15178
15200
|
const harnesses2 = {};
|
|
15201
|
+
const models = {};
|
|
15179
15202
|
for (const type of dialogTypes) {
|
|
15180
|
-
const
|
|
15181
|
-
|
|
15182
|
-
);
|
|
15203
|
+
const typeDefaults = child(defaults, type);
|
|
15204
|
+
const parsed = typeShape.harness.safeParse(child(typeDefaults, "harness"));
|
|
15183
15205
|
if (!parsed.success) return { error: `harness.defaults.${type}.harness` };
|
|
15184
15206
|
harnesses2[type] = parsed.data ?? engine.data;
|
|
15207
|
+
const model = typeShape.model.safeParse(child(typeDefaults, "model"));
|
|
15208
|
+
if (!model.success) return { error: `harness.defaults.${type}.model` };
|
|
15209
|
+
if (model.data) models[type] = model.data;
|
|
15185
15210
|
}
|
|
15186
|
-
return { harnesses: harnesses2 };
|
|
15211
|
+
return { harnesses: harnesses2, models };
|
|
15187
15212
|
}
|
|
15188
15213
|
|
|
15189
15214
|
// src/commands/sessions/web/newSessionDefaults.ts
|
|
@@ -15217,7 +15242,7 @@ function newSessionDefaults(req, res) {
|
|
|
15217
15242
|
respondJson(res, 422, { error: `Invalid config ${resolved.error}` });
|
|
15218
15243
|
return;
|
|
15219
15244
|
}
|
|
15220
|
-
respondJson(res, 200, { mode: parsed.data,
|
|
15245
|
+
respondJson(res, 200, { mode: parsed.data, ...resolved });
|
|
15221
15246
|
}
|
|
15222
15247
|
|
|
15223
15248
|
// src/commands/sessions/nodes/fetchPeerJson.ts
|
|
@@ -36847,6 +36872,7 @@ var persistedSessionSchema = z21.object({
|
|
|
36847
36872
|
divergenceEscalation: z21.boolean().optional(),
|
|
36848
36873
|
design: z21.boolean().optional(),
|
|
36849
36874
|
auto: z21.boolean().optional(),
|
|
36875
|
+
model: z21.string().optional(),
|
|
36850
36876
|
autoAdvance: z21.boolean().optional(),
|
|
36851
36877
|
autoApprove: z21.boolean().optional(),
|
|
36852
36878
|
reviewStarted: z21.boolean().optional(),
|
|
@@ -36883,6 +36909,7 @@ function toPersistedSession(session) {
|
|
|
36883
36909
|
divergenceEscalation: session.divergenceEscalation,
|
|
36884
36910
|
design: session.design,
|
|
36885
36911
|
auto: session.auto,
|
|
36912
|
+
model: session.model,
|
|
36886
36913
|
autoAdvance: session.autoAdvance,
|
|
36887
36914
|
autoApprove: session.autoApprove,
|
|
36888
36915
|
reviewStarted: session.reviewStarted,
|
|
@@ -55083,129 +55110,6 @@ var ClientHub = class extends Set {
|
|
|
55083
55110
|
};
|
|
55084
55111
|
};
|
|
55085
55112
|
|
|
55086
|
-
// src/commands/sessions/daemon/designSystemPromptPath.ts
|
|
55087
|
-
import * as path117 from "path";
|
|
55088
|
-
import { fileURLToPath as fileURLToPath11 } from "url";
|
|
55089
|
-
var __filename6 = fileURLToPath11(import.meta.url);
|
|
55090
|
-
var __dirname7 = path117.dirname(__filename6);
|
|
55091
|
-
function designSystemPromptPath() {
|
|
55092
|
-
return path117.join(__dirname7, "..", "claude", "design-system-prompt.md");
|
|
55093
|
-
}
|
|
55094
|
-
|
|
55095
|
-
// src/commands/sessions/daemon/sessionModeLaunch.ts
|
|
55096
|
-
function sessionModeLaunch(adapter, { design, auto }) {
|
|
55097
|
-
if (!design) return { auto };
|
|
55098
|
-
const blocker = launchBlocker(adapter, designFeature);
|
|
55099
|
-
if (blocker) {
|
|
55100
|
-
daemonLog(
|
|
55101
|
-
`design: launching without the design prompt, ${blocker.replaceAll("\n", " ")}`
|
|
55102
|
-
);
|
|
55103
|
-
return { auto };
|
|
55104
|
-
}
|
|
55105
|
-
return { appendSystemPromptFile: designSystemPromptPath(), auto: true };
|
|
55106
|
-
}
|
|
55107
|
-
|
|
55108
|
-
// src/commands/sessions/daemon/resolveRunConfig.ts
|
|
55109
|
-
function resolveRunConfig(name2, cwd) {
|
|
55110
|
-
try {
|
|
55111
|
-
const { run: run5 } = loadConfigFrom(cwd);
|
|
55112
|
-
const configs = resolveRunConfigs(run5, runConfigBaseDirFrom(cwd));
|
|
55113
|
-
const exact = configs.find((r) => r.name === name2);
|
|
55114
|
-
if (exact) return exact;
|
|
55115
|
-
const suffixMatches = configs.filter((r) => r.name.endsWith(`:${name2}`));
|
|
55116
|
-
return suffixMatches.length === 1 ? suffixMatches[0] : void 0;
|
|
55117
|
-
} catch {
|
|
55118
|
-
return void 0;
|
|
55119
|
-
}
|
|
55120
|
-
}
|
|
55121
|
-
|
|
55122
|
-
// src/commands/sessions/daemon/serverRunMeta.ts
|
|
55123
|
-
var DEFAULT_SERVER_GROUP = "default";
|
|
55124
|
-
function serverRunMeta(runName, cwd) {
|
|
55125
|
-
const dir = cwd ?? process.cwd();
|
|
55126
|
-
const config = resolveRunConfig(runName, dir);
|
|
55127
|
-
if (!config?.server) return { server: false };
|
|
55128
|
-
return {
|
|
55129
|
-
server: true,
|
|
55130
|
-
group: typeof config.server === "string" ? config.server : DEFAULT_SERVER_GROUP,
|
|
55131
|
-
port: config.port,
|
|
55132
|
-
protocol: config.protocol,
|
|
55133
|
-
path: config.path,
|
|
55134
|
-
origin: getCurrentOrigin(dir)
|
|
55135
|
-
};
|
|
55136
|
-
}
|
|
55137
|
-
|
|
55138
|
-
// src/commands/sessions/daemon/spawnRun.ts
|
|
55139
|
-
function spawnRun(opts) {
|
|
55140
|
-
return spawnPty(["assist", "run", opts.name, ...opts.args ?? []], opts.cwd);
|
|
55141
|
-
}
|
|
55142
|
-
|
|
55143
|
-
// src/commands/sessions/daemon/startOrHoldPty.ts
|
|
55144
|
-
function startOrHoldPty(start2, hold) {
|
|
55145
|
-
if (hold) return { pty: null, pendingStart: start2 };
|
|
55146
|
-
return { pty: start2() };
|
|
55147
|
-
}
|
|
55148
|
-
|
|
55149
|
-
// src/commands/sessions/daemon/sessionBase.ts
|
|
55150
|
-
function sessionBase(id, status2) {
|
|
55151
|
-
const startedAt = Date.now();
|
|
55152
|
-
return {
|
|
55153
|
-
id,
|
|
55154
|
-
status: status2,
|
|
55155
|
-
startedAt,
|
|
55156
|
-
runningMs: 0,
|
|
55157
|
-
/* why: runningMs counts only running stretches, so a session that starts
|
|
55158
|
-
* waiting (idle, awaiting first input) has no open stretch to stamp. */
|
|
55159
|
-
runningSince: status2 === "running" ? startedAt : null,
|
|
55160
|
-
waitingSince: status2 === "waiting" ? startedAt : null,
|
|
55161
|
-
scrollback: ""
|
|
55162
|
-
};
|
|
55163
|
-
}
|
|
55164
|
-
|
|
55165
|
-
// src/commands/sessions/daemon/createSession.ts
|
|
55166
|
-
function createSession(id, { prompt, cwd, design, auto, harness, holdPty } = {}) {
|
|
55167
|
-
const adapter = harnessAdapter(harness);
|
|
55168
|
-
const conversationId = preassignedId(adapter);
|
|
55169
|
-
return {
|
|
55170
|
-
...sessionBase(id, prompt ? "running" : "waiting"),
|
|
55171
|
-
name: `Session ${id}`,
|
|
55172
|
-
commandType: "claude",
|
|
55173
|
-
...adapter.activityIdentity(conversationId),
|
|
55174
|
-
...startOrHoldPty(
|
|
55175
|
-
() => adapter.interactive({
|
|
55176
|
-
prompt,
|
|
55177
|
-
cwd,
|
|
55178
|
-
sessionId: id,
|
|
55179
|
-
conversationId,
|
|
55180
|
-
...sessionModeLaunch(adapter, { design, auto })
|
|
55181
|
-
}),
|
|
55182
|
-
holdPty
|
|
55183
|
-
),
|
|
55184
|
-
cwd,
|
|
55185
|
-
initialPrompt: prompt,
|
|
55186
|
-
design,
|
|
55187
|
-
auto
|
|
55188
|
-
};
|
|
55189
|
-
}
|
|
55190
|
-
function createRunSession(id, { runName, runArgs, cwd, meta }) {
|
|
55191
|
-
const serverMeta = meta ?? serverRunMeta(runName, cwd);
|
|
55192
|
-
return {
|
|
55193
|
-
...sessionBase(id, "running"),
|
|
55194
|
-
name: `run: ${runName}`,
|
|
55195
|
-
commandType: "run",
|
|
55196
|
-
pty: spawnRun({ name: runName, args: runArgs, cwd }),
|
|
55197
|
-
runName,
|
|
55198
|
-
runArgs,
|
|
55199
|
-
cwd,
|
|
55200
|
-
server: serverMeta.server || void 0,
|
|
55201
|
-
serverPort: serverMeta.port,
|
|
55202
|
-
serverProtocol: serverMeta.protocol,
|
|
55203
|
-
serverPath: serverMeta.path,
|
|
55204
|
-
serverOrigin: serverMeta.origin,
|
|
55205
|
-
serverGroup: serverMeta.group
|
|
55206
|
-
};
|
|
55207
|
-
}
|
|
55208
|
-
|
|
55209
55113
|
// src/commands/sessions/daemon/autoUpdate/autoUpdateControl.ts
|
|
55210
55114
|
import { existsSync as existsSync99, rmSync as rmSync15, writeFileSync as writeFileSync64 } from "fs";
|
|
55211
55115
|
var paused;
|
|
@@ -55388,16 +55292,98 @@ function trimWatcherLog(cwd) {
|
|
|
55388
55292
|
|
|
55389
55293
|
// src/commands/sessions/daemon/worktree/appendWatcherLog.ts
|
|
55390
55294
|
import { appendFileSync as appendFileSync4, mkdirSync as mkdirSync45 } from "fs";
|
|
55391
|
-
import { dirname as
|
|
55295
|
+
import { dirname as dirname54 } from "path";
|
|
55392
55296
|
function appendWatcherLog(cwd, data) {
|
|
55393
55297
|
try {
|
|
55394
55298
|
const path118 = watcherLogPath(cwd);
|
|
55395
|
-
mkdirSync45(
|
|
55299
|
+
mkdirSync45(dirname54(path118), { recursive: true });
|
|
55396
55300
|
appendFileSync4(path118, data);
|
|
55397
55301
|
} catch {
|
|
55398
55302
|
}
|
|
55399
55303
|
}
|
|
55400
55304
|
|
|
55305
|
+
// src/commands/sessions/daemon/designSystemPromptPath.ts
|
|
55306
|
+
import * as path117 from "path";
|
|
55307
|
+
import { fileURLToPath as fileURLToPath11 } from "url";
|
|
55308
|
+
var __filename6 = fileURLToPath11(import.meta.url);
|
|
55309
|
+
var __dirname7 = path117.dirname(__filename6);
|
|
55310
|
+
function designSystemPromptPath() {
|
|
55311
|
+
return path117.join(__dirname7, "..", "claude", "design-system-prompt.md");
|
|
55312
|
+
}
|
|
55313
|
+
|
|
55314
|
+
// src/commands/sessions/daemon/sessionModeLaunch.ts
|
|
55315
|
+
function sessionModeLaunch(adapter, { design, auto, model }) {
|
|
55316
|
+
return model ? { ...designLaunch(adapter, design, auto), model } : designLaunch(adapter, design, auto);
|
|
55317
|
+
}
|
|
55318
|
+
function designLaunch(adapter, design, auto) {
|
|
55319
|
+
if (!design) return { auto };
|
|
55320
|
+
const blocker = launchBlocker(adapter, designFeature);
|
|
55321
|
+
if (blocker) {
|
|
55322
|
+
daemonLog(
|
|
55323
|
+
`design: launching without the design prompt, ${blocker.replaceAll("\n", " ")}`
|
|
55324
|
+
);
|
|
55325
|
+
return { auto };
|
|
55326
|
+
}
|
|
55327
|
+
return { appendSystemPromptFile: designSystemPromptPath(), auto: true };
|
|
55328
|
+
}
|
|
55329
|
+
|
|
55330
|
+
// src/commands/sessions/daemon/startOrHoldPty.ts
|
|
55331
|
+
function startOrHoldPty(start2, hold) {
|
|
55332
|
+
if (hold) return { pty: null, pendingStart: start2 };
|
|
55333
|
+
return { pty: start2() };
|
|
55334
|
+
}
|
|
55335
|
+
|
|
55336
|
+
// src/commands/sessions/daemon/sessionBase.ts
|
|
55337
|
+
function sessionBase(id, status2) {
|
|
55338
|
+
const startedAt = Date.now();
|
|
55339
|
+
return {
|
|
55340
|
+
id,
|
|
55341
|
+
status: status2,
|
|
55342
|
+
startedAt,
|
|
55343
|
+
runningMs: 0,
|
|
55344
|
+
/* why: runningMs counts only running stretches, so a session that starts
|
|
55345
|
+
* waiting (idle, awaiting first input) has no open stretch to stamp. */
|
|
55346
|
+
runningSince: status2 === "running" ? startedAt : null,
|
|
55347
|
+
waitingSince: status2 === "waiting" ? startedAt : null,
|
|
55348
|
+
scrollback: ""
|
|
55349
|
+
};
|
|
55350
|
+
}
|
|
55351
|
+
|
|
55352
|
+
// src/commands/sessions/daemon/createSession.ts
|
|
55353
|
+
function createSession(id, {
|
|
55354
|
+
prompt,
|
|
55355
|
+
cwd,
|
|
55356
|
+
design,
|
|
55357
|
+
auto,
|
|
55358
|
+
harness,
|
|
55359
|
+
model,
|
|
55360
|
+
holdPty
|
|
55361
|
+
} = {}) {
|
|
55362
|
+
const adapter = harnessAdapter(harness);
|
|
55363
|
+
const conversationId = preassignedId(adapter);
|
|
55364
|
+
return {
|
|
55365
|
+
...sessionBase(id, prompt ? "running" : "waiting"),
|
|
55366
|
+
name: `Session ${id}`,
|
|
55367
|
+
commandType: "claude",
|
|
55368
|
+
...adapter.activityIdentity(conversationId),
|
|
55369
|
+
...startOrHoldPty(
|
|
55370
|
+
() => adapter.interactive({
|
|
55371
|
+
prompt,
|
|
55372
|
+
cwd,
|
|
55373
|
+
sessionId: id,
|
|
55374
|
+
conversationId,
|
|
55375
|
+
...sessionModeLaunch(adapter, { design, auto, model })
|
|
55376
|
+
}),
|
|
55377
|
+
holdPty
|
|
55378
|
+
),
|
|
55379
|
+
cwd,
|
|
55380
|
+
initialPrompt: prompt,
|
|
55381
|
+
design,
|
|
55382
|
+
auto,
|
|
55383
|
+
model
|
|
55384
|
+
};
|
|
55385
|
+
}
|
|
55386
|
+
|
|
55401
55387
|
// src/commands/sessions/daemon/worktree/detectExistingWorktree.ts
|
|
55402
55388
|
function detectExistingWorktree(cwd) {
|
|
55403
55389
|
const repoRoot3 = findRepoRoot(cwd) ?? cwd;
|
|
@@ -57070,6 +57056,22 @@ function emitSessionOutput(session, clients, data) {
|
|
|
57070
57056
|
// src/commands/sessions/daemon/exitReason.ts
|
|
57071
57057
|
import { existsSync as existsSync105 } from "fs";
|
|
57072
57058
|
import { resolve as resolve34 } from "path";
|
|
57059
|
+
|
|
57060
|
+
// src/commands/sessions/daemon/resolveRunConfig.ts
|
|
57061
|
+
function resolveRunConfig(name2, cwd) {
|
|
57062
|
+
try {
|
|
57063
|
+
const { run: run5 } = loadConfigFrom(cwd);
|
|
57064
|
+
const configs = resolveRunConfigs(run5, runConfigBaseDirFrom(cwd));
|
|
57065
|
+
const exact = configs.find((r) => r.name === name2);
|
|
57066
|
+
if (exact) return exact;
|
|
57067
|
+
const suffixMatches = configs.filter((r) => r.name.endsWith(`:${name2}`));
|
|
57068
|
+
return suffixMatches.length === 1 ? suffixMatches[0] : void 0;
|
|
57069
|
+
} catch {
|
|
57070
|
+
return void 0;
|
|
57071
|
+
}
|
|
57072
|
+
}
|
|
57073
|
+
|
|
57074
|
+
// src/commands/sessions/daemon/exitReason.ts
|
|
57073
57075
|
function exitDetail(session) {
|
|
57074
57076
|
if (session.cwd && !existsSync105(session.cwd))
|
|
57075
57077
|
return `working directory ${session.cwd} no longer exists`;
|
|
@@ -58695,6 +58697,7 @@ function restoreBase(id, persisted) {
|
|
|
58695
58697
|
divergenceEscalation: persisted.divergenceEscalation,
|
|
58696
58698
|
design: persisted.design,
|
|
58697
58699
|
auto: persisted.auto,
|
|
58700
|
+
model: persisted.model,
|
|
58698
58701
|
autoAdvance: restoredAutoAdvance(id, persisted),
|
|
58699
58702
|
autoApprove: persisted.autoApprove,
|
|
58700
58703
|
reviewStarted: persisted.reviewStarted,
|
|
@@ -58897,6 +58900,7 @@ function createHeld(id, persisted) {
|
|
|
58897
58900
|
design: persisted.design,
|
|
58898
58901
|
auto: persisted.auto,
|
|
58899
58902
|
harness: persisted.harness,
|
|
58903
|
+
model: persisted.model,
|
|
58900
58904
|
holdPty: true
|
|
58901
58905
|
});
|
|
58902
58906
|
return void 0;
|
|
@@ -59048,6 +59052,27 @@ function restoreConversation(adapter, restored, status2) {
|
|
|
59048
59052
|
return plan2.idle ? waitingSession(base, persisted, pty2) : runningSession(base, persisted, pty2);
|
|
59049
59053
|
}
|
|
59050
59054
|
|
|
59055
|
+
// src/commands/sessions/daemon/serverRunMeta.ts
|
|
59056
|
+
var DEFAULT_SERVER_GROUP = "default";
|
|
59057
|
+
function serverRunMeta(runName, cwd) {
|
|
59058
|
+
const dir = cwd ?? process.cwd();
|
|
59059
|
+
const config = resolveRunConfig(runName, dir);
|
|
59060
|
+
if (!config?.server) return { server: false };
|
|
59061
|
+
return {
|
|
59062
|
+
server: true,
|
|
59063
|
+
group: typeof config.server === "string" ? config.server : DEFAULT_SERVER_GROUP,
|
|
59064
|
+
port: config.port,
|
|
59065
|
+
protocol: config.protocol,
|
|
59066
|
+
path: config.path,
|
|
59067
|
+
origin: getCurrentOrigin(dir)
|
|
59068
|
+
};
|
|
59069
|
+
}
|
|
59070
|
+
|
|
59071
|
+
// src/commands/sessions/daemon/spawnRun.ts
|
|
59072
|
+
function spawnRun(opts) {
|
|
59073
|
+
return spawnPty(["assist", "run", opts.name, ...opts.args ?? []], opts.cwd);
|
|
59074
|
+
}
|
|
59075
|
+
|
|
59051
59076
|
// src/commands/sessions/daemon/restoreServerRun.ts
|
|
59052
59077
|
function restoreServerRun(id, persisted, base) {
|
|
59053
59078
|
const { runName } = persisted;
|
|
@@ -60680,7 +60705,7 @@ async function seedBacklogRunActivity(sessions, session, notify2) {
|
|
|
60680
60705
|
}
|
|
60681
60706
|
|
|
60682
60707
|
// src/commands/sessions/daemon/worktree/spawnInTree.ts
|
|
60683
|
-
function spawnInTree(ctx, { prompt, cwd, design, auto, harness, inPlace }, context) {
|
|
60708
|
+
function spawnInTree(ctx, { prompt, cwd, design, auto, harness, model, inPlace }, context) {
|
|
60684
60709
|
return allocateAndBind(
|
|
60685
60710
|
ctx,
|
|
60686
60711
|
cwd,
|
|
@@ -60690,6 +60715,7 @@ function spawnInTree(ctx, { prompt, cwd, design, auto, harness, inPlace }, conte
|
|
|
60690
60715
|
design,
|
|
60691
60716
|
auto,
|
|
60692
60717
|
harness,
|
|
60718
|
+
model,
|
|
60693
60719
|
holdPty: holdUntilSeeded
|
|
60694
60720
|
}),
|
|
60695
60721
|
{ inPlace },
|
|
@@ -60801,6 +60827,26 @@ function resumeInTree(ctx, sessionId2, cwd, name2, harness) {
|
|
|
60801
60827
|
return id;
|
|
60802
60828
|
}
|
|
60803
60829
|
|
|
60830
|
+
// src/commands/sessions/daemon/createRunSession.ts
|
|
60831
|
+
function createRunSession(id, { runName, runArgs, cwd, meta }) {
|
|
60832
|
+
const serverMeta = meta ?? serverRunMeta(runName, cwd);
|
|
60833
|
+
return {
|
|
60834
|
+
...sessionBase(id, "running"),
|
|
60835
|
+
name: `run: ${runName}`,
|
|
60836
|
+
commandType: "run",
|
|
60837
|
+
pty: spawnRun({ name: runName, args: runArgs, cwd }),
|
|
60838
|
+
runName,
|
|
60839
|
+
runArgs,
|
|
60840
|
+
cwd,
|
|
60841
|
+
server: serverMeta.server || void 0,
|
|
60842
|
+
serverPort: serverMeta.port,
|
|
60843
|
+
serverProtocol: serverMeta.protocol,
|
|
60844
|
+
serverPath: serverMeta.path,
|
|
60845
|
+
serverOrigin: serverMeta.origin,
|
|
60846
|
+
serverGroup: serverMeta.group
|
|
60847
|
+
};
|
|
60848
|
+
}
|
|
60849
|
+
|
|
60804
60850
|
// src/commands/sessions/daemon/SessionManager.ts
|
|
60805
60851
|
var SessionManager = class {
|
|
60806
60852
|
constructor(onIdleChange) {
|
|
@@ -62175,22 +62221,27 @@ function spawnAssistCreate(m, d) {
|
|
|
62175
62221
|
return prCheckoutHolder(assistArgs, cwd).then(spawn14);
|
|
62176
62222
|
}
|
|
62177
62223
|
|
|
62178
|
-
// src/commands/sessions/daemon/
|
|
62224
|
+
// src/commands/sessions/daemon/sessionBlocker.ts
|
|
62179
62225
|
function sessionBlocker(harness, design) {
|
|
62180
62226
|
return launchBlocker(
|
|
62181
62227
|
harnessAdapter(harness),
|
|
62182
62228
|
design ? designFeature : sessionFeature
|
|
62183
62229
|
);
|
|
62184
62230
|
}
|
|
62231
|
+
|
|
62232
|
+
// src/commands/sessions/daemon/spawnCreate.ts
|
|
62185
62233
|
function spawnCreate(m, d) {
|
|
62186
62234
|
const design = d.design === true;
|
|
62187
62235
|
const harness = d.harness;
|
|
62188
62236
|
const prompt = d.prompt;
|
|
62189
62237
|
const auto = d.auto === true;
|
|
62238
|
+
const model = typeof d.model === "string" && d.model ? d.model : void 0;
|
|
62190
62239
|
if (design)
|
|
62191
62240
|
daemonLog(`create: design session (cwd=${d.cwd ?? ""})`);
|
|
62192
62241
|
if (harness)
|
|
62193
|
-
daemonLog(
|
|
62242
|
+
daemonLog(
|
|
62243
|
+
`create: ${harness} session${model ? ` on ${model}` : ""} (cwd=${d.cwd ?? ""})`
|
|
62244
|
+
);
|
|
62194
62245
|
const joinSessionId = design ? void 0 : d.joinSessionId;
|
|
62195
62246
|
if (joinSessionId) {
|
|
62196
62247
|
const joined = m.addAgent(joinSessionId, { prompt, harness, auto });
|
|
@@ -62209,6 +62260,7 @@ function spawnCreate(m, d) {
|
|
|
62209
62260
|
design,
|
|
62210
62261
|
auto,
|
|
62211
62262
|
harness,
|
|
62263
|
+
model,
|
|
62212
62264
|
inPlace: d.inPlace === true
|
|
62213
62265
|
},
|
|
62214
62266
|
spawnContextFrom(d)
|