@agentshouse/kit 0.2.1-ca18b01951c3b → 0.2.1-caf8b8e5a324f

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/README.md CHANGED
@@ -5,18 +5,18 @@ your Agents' conversations through the agent CLIs you chose and gives each Agent
5
5
 
6
6
  ## Install
7
7
 
8
- Run `curl -fsSL agents.house/kit | sh`, or `irm agents.house/kit.ps1 | iex` on Windows, and again to update;
9
- options follow `sh -s --`. On macOS and Linux it installs House Kit natively under your own account, without an admin password,
10
- as a service that runs while you are logged in. `kit` and `house` are then on
11
- your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
8
+ Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "House Kit could not be downloaded; run this command again." >&2; exit 1; }; eval "$kit"' agents.house/kit`,
9
+ or `& { try { $kit = irm agents.house/kit.ps1 } catch { throw 'House Kit could not be downloaded; run this command again.' }; & ([scriptblock]::Create($kit)) @args }` on Windows, which run nothing of a failed download, and again to update; options follow `agents.house/kit`.
10
+ On macOS and Linux it installs House Kit natively under your own account, without an admin password, as a service that runs
11
+ while you are logged in. `kit` and `house` are then on your login shell's `PATH`, and your workspace is `~/AgentsHouse` unless you
12
12
  pass `--workspace <path>`.
13
13
 
14
14
  Add `--container` to run House Kit in one Docker container instead, with your
15
15
  workspace mounted at `/agents/house`; your Agents then reach only that
16
- workspace. On Windows 11 the container is the one choice. Append a `kit` or
17
- `house` command to the container's options to run it in that container.
16
+ workspace. On Windows 11 the container is the one choice. Append a `kit` or `house` command to the container's options to run it in that container.
18
17
  Running the command for the other choice on a connected computer asks you to
19
- confirm, then replaces its Environment, whose Agents end, with a new one.
18
+ confirm, then replaces its Environment, whose Agents end, with a new one. Running it with another `HOUSE_KIT_HOME`
19
+ than the installed Kit's asks you to confirm before it replaces that Kit, and leaves that Kit home as it was.
20
20
 
21
21
  On your own Linux server, run the Linux command with `--linux` to
22
22
  install House Kit natively, with its workspace at `/agents/house`; `kit` and
@@ -37,19 +37,19 @@ or another, continues on its own and keeps the Environment's credential in
37
37
  reconnects an Environment you already have; `--rooms <ref>[,<ref>...]` gives it
38
38
  only those Rooms and `--no-private` every Room but your Private Room; `--code <code>` connects immediately without a link.
39
39
  A login also connects your own agent: outside an Agent conversation, `house <tool>` calls
40
- House as you and `git` clones and pushes your Apps at `<house>/app/` as you, until you revoke
41
- that connection on Connections. `house help` lists the Tools. Codex sessions started after a
40
+ House as you and `git` clones and pushes your Apps at `<house>/app/` as you, each through the Kit
41
+ home `$HOUSE_KIT_HOME` names where it runs, until you revoke that connection on Connections. `house help` lists the Tools. Codex sessions started after a
42
42
  login run a lone `house` command outside their sandbox. `kit logout` disconnects this
43
43
  computer, stops House Kit and ends your own agent's connection, so `house` and `git` no
44
44
  longer act as you here; a later `kit login` reconnects the same Environment, or connects
45
45
  this computer as a new one when House no longer holds it.
46
46
  In a container you do not control, such as ChatGPT's, `npm i -g @agentshouse/kit` and `kit chatgpt --key <key>` with a key made on Connections let `house <tool>` act as you, starting and configuring nothing else.
47
47
 
48
- `kit resident` keeps the Environment connected and, as it connects, copies the text of each Room
49
- you chose for it as a Git repository in the workspace's `local-copies`. `house fetch` records
50
- House's changes on each copy's `refs/house/received`; rebase onto it, commit and run
51
- `house push --owner` in the copy, through the install command in the container. An Agent runs
52
- both, without `--owner`. `house upload` and `house download` move a Room's other files.
48
+ `kit resident` keeps the Environment connected and, as it connects, copies the text of each Room you chose for it as a
49
+ Git repository in the workspace's `local-copies`, and erases a Room's copy, unpushed commits included, once the Room
50
+ may no longer be copied here. `house fetch` does the same and records House's changes on each copy's
51
+ `refs/house/received`; rebase onto it, commit and run `house push --owner` in the copy, through the install command in
52
+ the container. An Agent runs both, without `--owner`. `house upload` and `house download` move a Room's other files.
53
53
 
54
54
  House Kit turns each audio file of your message to an Agent into text on this
55
55
  computer before the Agent reads it. While transcription is on, the speech
package/dist/agents.js CHANGED
@@ -1,5 +1,6 @@
1
1
  import { client } from '@agentclientprotocol/sdk';
2
2
  import { readFile, realpath } from 'node:fs/promises';
3
+ import { setTimeout as delay } from 'node:timers/promises';
3
4
  import { startAdapter } from './acp.js';
4
5
  import { CLIS, KIT_VERSION, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
5
6
  import { agentBase, kitHome } from './home.js';
@@ -7,6 +8,8 @@ import { updatesItself } from './placement.js';
7
8
  import { killTree } from './scope.js';
8
9
  import { holdTranscription, transcriptionReport } from './transcription.js';
9
10
  import { KIT_WIRE } from './wire.js';
11
+ // Two quiet seconds let a fresh conversation start before background model discovery competes for its CPU.
12
+ const MODEL_PROBE_QUIET_MS = 2_000;
10
13
  const SIGNED_OUT = { signed_in: false, models: [], modes: [] };
11
14
  function select(options, category) {
12
15
  const option = options.find((candidate) => candidate.category === category);
@@ -122,6 +125,7 @@ function reported(kind, reading) {
122
125
  full_access: CLIS[kind].fullAccess,
123
126
  };
124
127
  }
128
+ const NOT_READY = "the Agent's CLI is not ready on this computer";
125
129
  function tooOld(kind, release) {
126
130
  const cli = CLIS[kind];
127
131
  return `${cli.bin} ${release} is older than ${cli.minimum}, the oldest this Kit runs`;
@@ -162,6 +166,7 @@ export class Agents {
162
166
  installing = Promise.resolve();
163
167
  readings = new Map();
164
168
  reads = new Map();
169
+ starts = 0;
165
170
  sending = Promise.resolve();
166
171
  sent = null;
167
172
  refreshing = 0;
@@ -204,11 +209,12 @@ export class Agents {
204
209
  return reading.then(() => undefined);
205
210
  }
206
211
  cli(kind) {
212
+ this.starts += 1;
207
213
  return this.queue(kind, async () => {
208
214
  const resolved = await this.resolve(kind);
209
215
  if (!('cli' in resolved)) {
210
216
  this.update(kind, resolved);
211
- throw new Error(resolved.failure ?? tooOld(kind, resolved.release));
217
+ throw new Error(resolved.failure === null ? tooOld(kind, resolved.release) : NOT_READY);
212
218
  }
213
219
  const { cli, release } = resolved;
214
220
  const known = this.readings.get(kind);
@@ -217,7 +223,7 @@ export class Agents {
217
223
  this.update(kind, { release, failure: null, signed_in: kept.signed_in, models: kept.models, modes: kept.modes });
218
224
  }
219
225
  const read = this.nextRead(kind);
220
- offer(kind, cli, kept)
226
+ this.quietOffer(kind, cli, kept)
221
227
  .then((offered) => {
222
228
  const current = this.readings.get(kind);
223
229
  if (this.reads.get(kind) === read && current?.release === release)
@@ -304,11 +310,18 @@ export class Agents {
304
310
  if (this.reads.get(kind) === current && !signal?.aborted)
305
311
  this.readings.set(kind, reading);
306
312
  }
313
+ async quietOffer(kind, cli, known) {
314
+ for (let seen = -1; seen !== this.starts;) {
315
+ seen = this.starts;
316
+ await delay(MODEL_PROBE_QUIET_MS);
317
+ }
318
+ return offer(kind, cli, known);
319
+ }
307
320
  async load(kind) {
308
321
  const known = this.readings.get(kind);
309
322
  if (known !== undefined && known.failure === null && known.minimum === undefined)
310
323
  return;
311
- await this.examine(kind, SIGNED_OUT, offer);
324
+ await this.examine(kind, SIGNED_OUT, (kind, cli, known) => this.quietOffer(kind, cli, known));
312
325
  await this.report();
313
326
  }
314
327
  async send() {
package/dist/api.js CHANGED
@@ -46,7 +46,7 @@ export async function post(house, path, body, credential, signal) {
46
46
  });
47
47
  const text = await answer.text();
48
48
  if (!answer.ok && tooOld(text))
49
- updateRequired(house);
49
+ updateRequired();
50
50
  if (!answer.ok)
51
51
  throw new HouseRefusal(path, answer.status, text);
52
52
  return JSON.parse(text);
package/dist/app-git.js CHANGED
@@ -1,15 +1,9 @@
1
- import { extname, resolve } from 'node:path';
2
- import { fileURLToPath } from 'node:url';
3
1
  import { run } from './git.js';
4
2
  import { kitHome, readOwnAgent } from './home.js';
5
- import { quoted } from './shell.js';
3
+ const HELPER = '!kit git-credential';
6
4
  function section(house) {
7
5
  return `credential.${new URL('/app/', house).href}`;
8
6
  }
9
- function helper() {
10
- const main = fileURLToPath(new URL(`./kit-main${extname(fileURLToPath(import.meta.url))}`, import.meta.url));
11
- return `!HOUSE_KIT_HOME=${quoted(resolve(kitHome()))} ${quoted(process.execPath)} ${quoted(main)} git-credential`;
12
- }
13
7
  async function configured(args) {
14
8
  try {
15
9
  return await run(kitHome(), ['config', '--global', ...args]);
@@ -20,30 +14,18 @@ async function configured(args) {
20
14
  throw error;
21
15
  }
22
16
  }
23
- async function forget(house) {
24
- await configured(['--remove-section', section(house)]);
25
- }
26
- async function register(house) {
27
- await forget(house);
28
- for (const value of ['', helper()]) {
29
- const ran = await configured(['--add', `${section(house)}.helper`, value]);
17
+ export async function placeAppGit(ownAgent) {
18
+ if (ownAgent === null)
19
+ return;
20
+ await configured(['--remove-section', section(ownAgent.house)]);
21
+ for (const value of ['', HELPER]) {
22
+ const ran = await configured(['--add', `${section(ownAgent.house)}.helper`, value]);
30
23
  if (ran === null)
31
24
  return;
32
25
  if (ran.status !== 0)
33
26
  throw new Error(`git config failed: ${ran.stderr.trim()}`);
34
27
  }
35
28
  }
36
- export async function placeAppGit(before, after) {
37
- if (before !== null && before.house !== after?.house)
38
- await forget(before.house);
39
- if (after !== null)
40
- await register(after.house);
41
- }
42
- export async function forgetAppGit() {
43
- const ownAgent = await readOwnAgent();
44
- if (ownAgent !== null)
45
- await forget(ownAgent.house);
46
- }
47
29
  export async function answerGitCredential(operation) {
48
30
  let asked = '';
49
31
  for await (const chunk of process.stdin)
@@ -55,8 +37,10 @@ export async function answerGitCredential(operation) {
55
37
  .filter((line) => line.includes('='))
56
38
  .map((line) => [line.slice(0, line.indexOf('=')), line.slice(line.indexOf('=') + 1)]));
57
39
  const ownAgent = await readOwnAgent();
58
- if (ownAgent === null)
40
+ if (ownAgent === null) {
41
+ process.stderr.write(`kit: Kit home ${kitHome()} is not signed in; run kit login\n`);
59
42
  return;
43
+ }
60
44
  const house = new URL(ownAgent.house);
61
45
  if (attributes.get('protocol') !== house.protocol.slice(0, -1) || attributes.get('host') !== house.host)
62
46
  return;
@@ -1,23 +1,23 @@
1
1
  {
2
2
  "schemaVersion": 2,
3
- "version": "0.2.1-ca18b01951c3b",
3
+ "version": "0.2.1-caf8b8e5a324f",
4
4
  "hosts": {
5
5
  "macos": {
6
6
  "asset": {
7
7
  "name": "connect-linux.sh",
8
- "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-ca18b01951c3b/connect-linux.sh"
8
+ "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-caf8b8e5a324f/connect-linux.sh"
9
9
  }
10
10
  },
11
11
  "linux": {
12
12
  "asset": {
13
13
  "name": "connect-linux.sh",
14
- "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-ca18b01951c3b/connect-linux.sh"
14
+ "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-caf8b8e5a324f/connect-linux.sh"
15
15
  }
16
16
  },
17
17
  "windows": {
18
18
  "asset": {
19
19
  "name": "connect-windows.ps1",
20
- "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-ca18b01951c3b/connect-windows.ps1"
20
+ "url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-caf8b8e5a324f/connect-windows.ps1"
21
21
  }
22
22
  }
23
23
  }
package/dist/bridge.js CHANGED
@@ -1,7 +1,6 @@
1
1
  import { createHash, randomUUID } from 'node:crypto';
2
2
  import { once } from 'node:events';
3
3
  import { setTimeout as delay } from 'node:timers/promises';
4
- import { mkdir } from 'node:fs/promises';
5
4
  import { createServer, request as httpRequest } from 'node:http';
6
5
  import { request as httpsRequest } from 'node:https';
7
6
  import { delimiter, dirname, join } from 'node:path';
@@ -9,7 +8,7 @@ import { parse } from 'yaml';
9
8
  import { finalRefusal, HouseRefusal, retryDelay, retrying } from './api.js';
10
9
  import { loginPath } from './clis.js';
11
10
  import { changedPaths, } from './copies.js';
12
- import { kitHome, readEnrolment } from './home.js';
11
+ import { kitHome, readEnrolment, socketDirectory } from './home.js';
13
12
  import { callHouse, mcpBody, rpc, UNREACHABLE } from './mcp.js';
14
13
  import { operationId } from './operation.js';
15
14
  import { refusalOf, retryable } from './refusals.js';
@@ -167,9 +166,7 @@ export async function openBridge(house, copies, conversationId, signal) {
167
166
  }
168
167
  return path === '/' ? forward(text) : { status: 404, text: '' };
169
168
  };
170
- const sockets = join(kitHome(), 'bridges');
171
- await mkdir(sockets, { recursive: true, mode: 0o700 });
172
- const socketPath = join(sockets, `${randomUUID()}.sock`);
169
+ const socketPath = join(socketDirectory(), `${randomUUID()}.sock`);
173
170
  const bridge = createServer(async (request, response) => {
174
171
  try {
175
172
  const path = request.url ?? '';
package/dist/chatgpt.js CHANGED
@@ -24,6 +24,9 @@ export async function chatgpt(argv) {
24
24
  throw new Error(`${house} does not accept this key; pass one from ${KEY_SOURCE}`);
25
25
  const relay = process.env.HOUSE_KIT_RELAY || undefined;
26
26
  await writeOwnAgent({ house, ...(relay === undefined ? {} : { relay }), credential: values.key });
27
- await placeAppGit(before, await readOwnAgent()).catch((error) => process.stderr.write(`kit: ${error.message}\n`));
27
+ await placeAppGit(await readOwnAgent()).catch((error) => process.stderr.write(`kit: ${error.message}\n`));
28
+ if (before !== null && before.credential !== values.key) {
29
+ process.stdout.write('This replaced the key this Kit home held; give each session its own HOUSE_KIT_HOME to keep its own key.\n');
30
+ }
28
31
  process.stdout.write(`house now calls ${house} as you, with the key kept in ${kitHome()}.\n`);
29
32
  }
package/dist/clis.js CHANGED
@@ -60,6 +60,9 @@ export async function allowHouseInCodex(path) {
60
60
  await rename(temporary, file);
61
61
  }
62
62
  async function nothing() { }
63
+ function answered(error) {
64
+ return typeof error === 'object' && error !== null ? error : {};
65
+ }
63
66
  function bridgeInClaudeSandbox(bridge) {
64
67
  return process.platform === 'darwin' ? { allowUnixSockets: [bridge] } : { allowAllUnixSockets: true };
65
68
  }
@@ -77,6 +80,10 @@ export const CLIS = {
77
80
  args: [],
78
81
  fullAccess: 'agent-full-access',
79
82
  sessionMeta: () => ({}),
83
+ unknownSession: (error) => {
84
+ const { code, data } = answered(error);
85
+ return code === -32603 && typeof data?.details === 'string' && data.details.startsWith('no rollout found');
86
+ },
80
87
  renames: true,
81
88
  allowHouse: allowHouseInCodex,
82
89
  signedIn: { command: ['login', 'status'] },
@@ -106,6 +113,7 @@ export const CLIS = {
106
113
  emitRawSDKMessages: RAW_SUBTYPES.map((subtype) => ({ type: 'system', subtype })),
107
114
  },
108
115
  }),
116
+ unknownSession: (error) => answered(error).code === -32002,
109
117
  renames: false,
110
118
  allowHouse: nothing,
111
119
  signedIn: { command: ['auth', 'status'] },
@@ -120,6 +128,7 @@ export const CLIS = {
120
128
  args: ['--sandbox', 'off', 'agent', '--always-approve', '--no-leader', 'stdio'],
121
129
  fullAccess: null,
122
130
  sessionMeta: () => ({}),
131
+ unknownSession: (error) => answered(error).data?.code === 'FS_NOT_FOUND',
123
132
  renames: false,
124
133
  allowHouse: nothing,
125
134
  signedIn: { initializeMeta: 'defaultAuthMethodId' },
@@ -6,7 +6,7 @@ import { unlessAborted } from './abort.js';
6
6
  import { startAdapter } from './acp.js';
7
7
  import { openBridge } from './bridge.js';
8
8
  import { CLIS } from './clis.js';
9
- import { readerFor } from './events.js';
9
+ import { answeredFailure, readerFor } from './events.js';
10
10
  import { placeFiles, uploadBytes } from './files.js';
11
11
  import { agentBase } from './home.js';
12
12
  import { instructions } from './instructions.js';
@@ -17,6 +17,22 @@ import { createHowWeWork } from './skills.js';
17
17
  import { transcribe } from './transcription.js';
18
18
  import { workFor } from './work.js';
19
19
  const KILLED = 'the conversation was killed';
20
+ const REFUSED = 'the CLI refused the prompt';
21
+ const NO_CONNECTION = "the Kit could not open this conversation's connection";
22
+ const NO_START = "the Agent's CLI did not start";
23
+ const NO_SESSION = "the Agent's CLI did not open a session";
24
+ const NO_RESUME = "the Agent's CLI could not resume this conversation";
25
+ const NO_SETTINGS = "the Agent's CLI refused the Agent's model, mode or effort";
26
+ class NotStarted extends Error {
27
+ }
28
+ async function step(reason, work) {
29
+ try {
30
+ return await work;
31
+ }
32
+ catch (error) {
33
+ throw new NotStarted(reason, { cause: error });
34
+ }
35
+ }
20
36
  const EXIT_PLAN_MODE = {
21
37
  parse(value) {
22
38
  if (typeof value !== 'object' || value === null || Array.isArray(value)) {
@@ -35,6 +51,13 @@ function answerMessage(request, response) {
35
51
  function logged(error) {
36
52
  process.stderr.write(`kit: ${causeOf(error)}\n`);
37
53
  }
54
+ function refusal(conversation, error) {
55
+ if (conversation.kills > 0)
56
+ return KILLED;
57
+ const cause = error instanceof NotStarted ? `${error.message}: ${causeOf(error.cause)}` : causeOf(error);
58
+ logged(new Error(`conversation ${conversation.id} did not start: ${cause}`));
59
+ return causeOf(error);
60
+ }
38
61
  function marker(bridge) {
39
62
  return `HOUSE_BRIDGE=${bridge.env.HOUSE_BRIDGE}`;
40
63
  }
@@ -65,6 +88,7 @@ class Conversation {
65
88
  subagents = new Map();
66
89
  held = [];
67
90
  opening = null;
91
+ prompted = null;
68
92
  kills = 0;
69
93
  killed = new AbortController();
70
94
  interrupts = 0;
@@ -208,10 +232,10 @@ export class Conversations {
208
232
  if (conversation.running !== null)
209
233
  return {};
210
234
  try {
211
- return { provider_session_id: await this.start(conversation, await this.route(conversation, input.agent_id), null) };
235
+ return { provider_session_id: await this.start(conversation, await this.route(conversation, input.agent_id), null, true) };
212
236
  }
213
237
  catch (error) {
214
- return { refused: causeOf(error) };
238
+ return { refused: refusal(conversation, error) };
215
239
  }
216
240
  }
217
241
  async message(conversation, input) {
@@ -228,7 +252,7 @@ export class Conversations {
228
252
  throw new Error(KILLED);
229
253
  }
230
254
  catch (error) {
231
- return { ack: Promise.resolve({ refused: conversation.kills > 0 ? KILLED : causeOf(error) }) };
255
+ return { ack: Promise.resolve({ refused: refusal(conversation, error) }) };
232
256
  }
233
257
  return {
234
258
  ack: new Promise((settle) => {
@@ -251,13 +275,17 @@ export class Conversations {
251
275
  async send(conversation, waiting) {
252
276
  const { input } = waiting;
253
277
  let ack = {};
278
+ let started = false;
254
279
  const prompt = [];
255
280
  try {
256
281
  if (conversation.running === null) {
257
- const resumed = input.provider_session_id ?? conversation.session;
258
- const opened = await this.start(conversation, waiting.route, resumed);
259
- if (resumed === null)
260
- ack = { provider_session_id: opened };
282
+ const stored = conversation.session ?? input.provider_session_id;
283
+ const empty = input.first === true && conversation.prompted !== stored;
284
+ started = (await this.start(conversation, waiting.route, stored, empty)) !== stored;
285
+ }
286
+ const session = conversation.running.sessionId;
287
+ if (started || (input.first === true && session !== input.provider_session_id)) {
288
+ ack = { provider_session_id: session };
261
289
  }
262
290
  if (input.first === true) {
263
291
  prompt.push({
@@ -269,11 +297,11 @@ export class Conversations {
269
297
  throw new Error(KILLED);
270
298
  }
271
299
  catch (error) {
272
- if ('provider_session_id' in ack) {
300
+ if (started) {
273
301
  conversation.session = null;
274
302
  await this.kill(conversation);
275
303
  }
276
- waiting.settle({ refused: conversation.kills > 0 ? KILLED : causeOf(error) });
304
+ waiting.settle({ refused: refusal(conversation, error) });
277
305
  return;
278
306
  }
279
307
  this.prompt(conversation, [...prompt, ...waiting.content]);
@@ -351,7 +379,7 @@ export class Conversations {
351
379
  }
352
380
  return route;
353
381
  }
354
- async start(conversation, route, sessionId) {
382
+ async start(conversation, route, sessionId, empty) {
355
383
  const reader = readerFor(route.kind);
356
384
  reader.session = sessionId;
357
385
  const app = client({ name: '@agentshouse/kit' })
@@ -359,7 +387,7 @@ export class Conversations {
359
387
  .onRequest('elicitation/create', ({ params, signal }) => this.ask(conversation, 'elicitation/create', params, asksSecret(params), signal))
360
388
  .onRequest('_x.ai/exit_plan_mode', EXIT_PLAN_MODE, ({ params, signal }) => this.ask(conversation, '_x.ai/exit_plan_mode', params, false, signal));
361
389
  const cli = await unlessAborted(this.kit.agents.cli(route.kind), conversation.killed.signal);
362
- const bridge = await openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal);
390
+ const bridge = await step(NO_CONNECTION, openBridge(this.kit.house, this.kit.copies, conversation.id, conversation.killed.signal));
363
391
  if (conversation.kills > 0) {
364
392
  bridge.close();
365
393
  throw new Error(KILLED);
@@ -370,24 +398,24 @@ export class Conversations {
370
398
  try {
371
399
  await unlessAborted(createHowWeWork(bridge), conversation.killed.signal);
372
400
  await CLIS[route.kind].allowHouse(bridge.env.PATH);
373
- const adapter = await startAdapter(route.kind, cli, route.working_directory, app, (message) => {
401
+ const streamed = await step(NO_CONNECTION, work.open(cli));
402
+ const adapter = await step(NO_START, startAdapter(route.kind, cli, route.working_directory, app, (message) => {
374
403
  work.read(message);
375
404
  this.read(conversation, reader, message);
376
- }, { ...bridge.env, ...(await work.open(cli)) }, undefined, scope);
405
+ }, { ...bridge.env, ...streamed }, undefined, scope));
377
406
  void adapter.exited.then(() => bridge.close());
378
407
  const agent = adapter.connection.agent;
379
408
  const cwd = route.working_directory;
380
409
  const _meta = CLIS[route.kind].sessionMeta(bridge.env.HOUSE_BRIDGE, conversation.id);
381
- const opened = sessionId === null
382
- ? await agent.request('session/new', { cwd, mcpServers: [], _meta })
383
- : { ...(await agent.request('session/resume', { sessionId, cwd, mcpServers: [], _meta })), sessionId };
410
+ const resumed = sessionId === null ? null : await this.resume(conversation, route.kind, adapter, { sessionId, cwd, mcpServers: [], _meta }, empty);
411
+ const opened = resumed ?? (await step(NO_SESSION, agent.request('session/new', { cwd, mcpServers: [], _meta })));
384
412
  reader.session = opened.sessionId;
385
- if (sessionId === null && CLIS[route.kind].renames) {
413
+ if (opened.sessionId !== sessionId && CLIS[route.kind].renames) {
386
414
  const prompt = [{ type: 'text', text: `/rename ${conversation.id}` }];
387
- await agent.request('session/prompt', { sessionId: opened.sessionId, prompt });
415
+ await step(NO_SESSION, agent.request('session/prompt', { sessionId: opened.sessionId, prompt }));
388
416
  }
389
417
  const running = { adapter, bridge, sessionId: opened.sessionId, killed: false, reader, work, scope };
390
- const options = await this.launchSettings(running, route, opened.configOptions ?? []);
418
+ const options = await step(NO_SETTINGS, this.launchSettings(running, route, opened.configOptions ?? []));
391
419
  void work.settled().then(() => scope.record());
392
420
  conversation.running = running;
393
421
  conversation.session = running.sessionId;
@@ -409,6 +437,18 @@ export class Conversations {
409
437
  conversation.opening = null;
410
438
  }
411
439
  }
440
+ async resume(conversation, kind, adapter, request, empty) {
441
+ try {
442
+ return { ...(await adapter.connection.agent.request('session/resume', request)), sessionId: request.sessionId };
443
+ }
444
+ catch (error) {
445
+ if (!empty || conversation.kills > 0 || !CLIS[kind].unknownSession(error)) {
446
+ throw new NotStarted(NO_RESUME, { cause: error });
447
+ }
448
+ logged(new Error(`conversation ${conversation.id} opens a new session: ${NO_RESUME}: ${causeOf(error)}`));
449
+ return null;
450
+ }
451
+ }
412
452
  async launchSettings(running, route, offered) {
413
453
  let options = offered;
414
454
  const settings = [
@@ -500,13 +540,15 @@ export class Conversations {
500
540
  this.kit.changed();
501
541
  return turn;
502
542
  }
503
- end(conversation, turn, failed) {
543
+ end(conversation, turn, failed, notice = null) {
504
544
  if (turn.ended)
505
545
  return;
506
546
  if (conversation.turn === turn) {
507
547
  for (const event of conversation.running?.reader.closeTurn() ?? [])
508
548
  this.apply(conversation, turn, event);
509
549
  }
550
+ if (notice !== null)
551
+ turn.parts.start({ type: 'marker', marker: 'retry', text: notice });
510
552
  turn.ended = true;
511
553
  conversation.open--;
512
554
  if (conversation.turn === turn)
@@ -524,7 +566,12 @@ export class Conversations {
524
566
  const running = conversation.running;
525
567
  const turn = this.begin(conversation);
526
568
  turn.prompted = true;
527
- running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then(() => this.end(conversation, turn, null), async (error) => {
569
+ conversation.prompted = running.sessionId;
570
+ running.adapter.connection.agent.request('session/prompt', { sessionId: running.sessionId, prompt }).then((answer) => {
571
+ const notice = answeredFailure(answer);
572
+ const failed = notice ?? (answer.stopReason === 'refusal' ? REFUSED : null);
573
+ this.end(conversation, turn, failed === null ? null : { failed }, notice);
574
+ }, async (error) => {
528
575
  if (running.adapter.connection.signal.aborted) {
529
576
  this.end(conversation, turn, { failed: running.killed ? KILLED : await running.adapter.exited });
530
577
  }