@agentshouse/kit 0.2.1-c5262a8cc063d → 0.2.1-c5883630417e1

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.
Files changed (100) hide show
  1. package/README.md +27 -26
  2. package/dist/acp.js +16 -93
  3. package/dist/agents.js +104 -42
  4. package/dist/api.js +36 -3
  5. package/dist/app-git.js +64 -0
  6. package/dist/bootstrap.json +4 -4
  7. package/dist/bridge.js +36 -52
  8. package/dist/chatgpt.js +26 -0
  9. package/dist/clis.js +128 -65
  10. package/dist/codex-main.js +58 -0
  11. package/dist/conversations.js +288 -236
  12. package/dist/copies.js +167 -139
  13. package/dist/end.js +22 -0
  14. package/dist/enrol-main.js +7 -1
  15. package/dist/events.js +521 -0
  16. package/dist/files.js +23 -2
  17. package/dist/git.js +11 -8
  18. package/dist/home.js +81 -6
  19. package/dist/house-main.js +186 -56
  20. package/dist/instructions.js +9 -32
  21. package/dist/kit-main.js +54 -6
  22. package/dist/login.js +109 -103
  23. package/dist/logout.js +16 -13
  24. package/dist/mcp.js +2 -1
  25. package/dist/parts.js +82 -0
  26. package/dist/placement.js +48 -0
  27. package/dist/refusals.js +12 -0
  28. package/dist/relay.js +20 -0
  29. package/dist/resident.js +38 -27
  30. package/dist/scope.js +203 -0
  31. package/dist/secret-input.js +4 -1
  32. package/dist/service-main.js +9 -0
  33. package/dist/service.js +33 -0
  34. package/dist/shell.js +3 -0
  35. package/dist/sign-in.js +34 -9
  36. package/dist/skills.js +81 -12
  37. package/dist/stream.js +37 -6
  38. package/dist/transcription.js +57 -9
  39. package/dist/update.js +30 -6
  40. package/dist/wire.js +6 -0
  41. package/dist/work.js +348 -0
  42. package/how-we-work.md +13 -3
  43. package/package.json +3 -2
  44. package/skills/ask-matt/SKILL.md +17 -11
  45. package/skills/ask-matt/agents/openai.yaml +1 -0
  46. package/skills/code-review/SKILL.md +5 -5
  47. package/skills/codebase-design/DESIGN-IT-TWICE.md +1 -1
  48. package/skills/codebase-design/SKILL.md +0 -2
  49. package/skills/diagnosing-bugs/SKILL.md +2 -4
  50. package/skills/domain-modeling/{CONTEXT-FORMAT.md → GLOSSARY-FORMAT.md} +10 -10
  51. package/skills/domain-modeling/SKILL.md +12 -14
  52. package/skills/grill-me/SKILL.md +1 -2
  53. package/skills/grill-me/agents/openai.yaml +1 -0
  54. package/skills/grill-with-docs/SKILL.md +1 -2
  55. package/skills/grill-with-docs/agents/openai.yaml +1 -0
  56. package/skills/grilling/SKILL.md +2 -2
  57. package/skills/handoff/SKILL.md +2 -3
  58. package/skills/handoff/agents/openai.yaml +1 -0
  59. package/skills/implement/SKILL.md +5 -4
  60. package/skills/implement/agents/openai.yaml +1 -0
  61. package/skills/implement-spec/SKILL.md +40 -0
  62. package/skills/implement-spec/agents/openai.yaml +5 -0
  63. package/skills/improve-codebase-architecture/SKILL.md +6 -7
  64. package/skills/improve-codebase-architecture/agents/openai.yaml +1 -0
  65. package/skills/pr/CREDITS.md +3 -0
  66. package/skills/pr/LICENSE +21 -0
  67. package/skills/pr/SKILL.md +170 -0
  68. package/skills/pr/agents/openai.yaml +3 -0
  69. package/skills/prototype/SKILL.md +0 -2
  70. package/skills/research/SKILL.md +0 -2
  71. package/skills/retro/LICENSE +21 -0
  72. package/skills/retro/SKILL.md +44 -0
  73. package/skills/retro/agents/openai.yaml +5 -0
  74. package/skills/tdd/SKILL.md +2 -4
  75. package/skills/teach/SKILL.md +3 -4
  76. package/skills/teach/agents/openai.yaml +1 -0
  77. package/skills/to-questionnaire/SKILL.md +1 -2
  78. package/skills/to-questionnaire/agents/openai.yaml +1 -0
  79. package/skills/to-spec/SKILL.md +1 -2
  80. package/skills/to-spec/agents/openai.yaml +1 -0
  81. package/skills/to-tickets/SKILL.md +3 -4
  82. package/skills/to-tickets/agents/openai.yaml +1 -0
  83. package/skills/triage/AGENT-BRIEF.md +207 -0
  84. package/skills/triage/LICENSE +21 -0
  85. package/skills/triage/OUT-OF-SCOPE.md +105 -0
  86. package/skills/triage/SKILL.md +112 -0
  87. package/skills/triage/agents/openai.yaml +5 -0
  88. package/skills/wait-what/SKILL.md +2 -3
  89. package/skills/wait-what/agents/openai.yaml +1 -0
  90. package/skills/wayfinder/SKILL.md +5 -6
  91. package/skills/wayfinder/agents/openai.yaml +1 -0
  92. package/skills/wizard/LICENSE +21 -0
  93. package/skills/wizard/SKILL.md +44 -0
  94. package/skills/wizard/agents/openai.yaml +3 -0
  95. package/skills/wizard/template.sh +223 -0
  96. package/skills/writing-for-agents/SKILL.md +0 -2
  97. package/dist/blocks.js +0 -51
  98. package/skills/resolving-merge-conflicts/SKILL.md +0 -16
  99. package/skills/resolving-merge-conflicts/agents/openai.yaml +0 -3
  100. /package/skills/{resolving-merge-conflicts → implement-spec}/LICENSE +0 -0
package/dist/home.js CHANGED
@@ -1,13 +1,49 @@
1
- import { existsSync } from 'node:fs';
1
+ import { randomUUID } from 'node:crypto';
2
+ import { accessSync, chmodSync, constants, existsSync, linkSync, lstatSync, mkdirSync, readFileSync, renameSync, rmSync } from 'node:fs';
2
3
  import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
3
- import { homedir } from 'node:os';
4
+ import { homedir, tmpdir } from 'node:os';
4
5
  import { join } from 'node:path';
6
+ import { selectRelay } from './relay.js';
5
7
  const ENROLMENT = 'credential.json';
6
8
  const DISCONNECTED = 'disconnected.json';
7
9
  const CONFIGURATION = 'kit.json';
8
10
  const OWN_AGENT = 'own-agent.json';
11
+ const RESTART = 'restart';
12
+ let defaulted;
13
+ function writable(directory) {
14
+ try {
15
+ accessSync(directory, constants.W_OK | constants.X_OK);
16
+ return true;
17
+ }
18
+ catch {
19
+ return false;
20
+ }
21
+ }
22
+ function ownTemporaryHome() {
23
+ const home = join(tmpdir(), `house-kit-${process.getuid()}`);
24
+ try {
25
+ mkdirSync(home, { mode: 0o700 });
26
+ }
27
+ catch (error) {
28
+ if (error.code !== 'EEXIST')
29
+ throw error;
30
+ }
31
+ const found = lstatSync(home);
32
+ if (found.isSymbolicLink())
33
+ throw new Error(`${home} is a symbolic link`);
34
+ if (!found.isDirectory())
35
+ throw new Error(`${home} is not a directory`);
36
+ if (found.uid !== process.getuid())
37
+ throw new Error(`${home} is not owned by this User`);
38
+ chmodSync(home, 0o700);
39
+ return home;
40
+ }
41
+ function defaultHome() {
42
+ const home = join(homedir(), '.house-kit');
43
+ return existsSync(home) || writable(homedir()) ? home : ownTemporaryHome();
44
+ }
9
45
  export function kitHome() {
10
- return process.env.HOUSE_KIT_HOME ?? join(homedir(), '.house-kit');
46
+ return process.env.HOUSE_KIT_HOME || (defaulted ??= defaultHome());
11
47
  }
12
48
  export function workspaceRoot() {
13
49
  return process.env.HOUSE_KIT_WORKSPACE ?? '/agents/house';
@@ -28,12 +64,15 @@ export async function readHome(name) {
28
64
  export async function writeHome(name, value) {
29
65
  const home = kitHome();
30
66
  await mkdir(home, { recursive: true, mode: 0o700 });
31
- const temporary = join(home, `${name}.${process.pid}`);
67
+ const temporary = join(home, `${name}.${randomUUID()}`);
32
68
  await writeFile(temporary, `${JSON.stringify(value)}\n`, { mode: 0o600 });
33
69
  await rename(temporary, join(home, name));
34
70
  }
35
- export function readEnrolment() {
36
- return readHome(ENROLMENT);
71
+ export async function readEnrolment() {
72
+ const enrolment = await readHome(ENROLMENT);
73
+ if (enrolment !== null)
74
+ selectRelay(process.env.HOUSE_KIT_RELAY || enrolment.relay);
75
+ return enrolment;
37
76
  }
38
77
  export async function writeEnrolment(enrolment) {
39
78
  await writeHome(ENROLMENT, enrolment);
@@ -42,13 +81,49 @@ export async function writeEnrolment(enrolment) {
42
81
  export function readDisconnected() {
43
82
  return readHome(DISCONNECTED);
44
83
  }
84
+ export function forgetDisconnected() {
85
+ return rm(join(kitHome(), DISCONNECTED), { force: true });
86
+ }
45
87
  export async function forgetEnrolment({ house, environment }) {
46
88
  await writeHome(DISCONNECTED, { house, environment });
47
89
  await rm(join(kitHome(), ENROLMENT), { force: true });
48
90
  }
91
+ export async function forgetRejected(rejected) {
92
+ const held = await readHome(ENROLMENT);
93
+ if (held?.credential !== rejected)
94
+ return;
95
+ await writeHome(DISCONNECTED, { house: held.house, environment: held.environment });
96
+ const enrolment = join(kitHome(), ENROLMENT);
97
+ const taken = `${enrolment}.${process.pid}`;
98
+ try {
99
+ renameSync(enrolment, taken);
100
+ }
101
+ catch (error) {
102
+ if (error.code === 'ENOENT')
103
+ return;
104
+ throw error;
105
+ }
106
+ if (JSON.parse(readFileSync(taken, 'utf8')).credential !== rejected) {
107
+ try {
108
+ linkSync(taken, enrolment);
109
+ }
110
+ catch (error) {
111
+ if (error.code !== 'EEXIST')
112
+ throw error;
113
+ }
114
+ rmSync(join(kitHome(), DISCONNECTED), { force: true });
115
+ }
116
+ rmSync(taken);
117
+ }
49
118
  export function enrolled() {
50
119
  return existsSync(join(kitHome(), ENROLMENT));
51
120
  }
121
+ export function restartAsked() {
122
+ return existsSync(join(kitHome(), RESTART));
123
+ }
124
+ export function forgetRestart() {
125
+ return rm(join(kitHome(), RESTART), { force: true });
126
+ }
52
127
  export function readOwnAgent() {
53
128
  return readHome(OWN_AGENT);
54
129
  }
@@ -1,62 +1,105 @@
1
1
  #!/usr/bin/env node
2
2
  import { createHash } from 'node:crypto';
3
- import { readFile } from 'node:fs/promises';
3
+ import { mkdir, readFile, writeFile } from 'node:fs/promises';
4
4
  import { request, setGlobalProxyFromEnv } from 'node:http';
5
- import { basename, join } from 'node:path';
5
+ import { basename, dirname, extname, join, resolve } from 'node:path';
6
+ import { verified } from './files.js';
7
+ import { HOUSE_REF } from './git.js';
6
8
  import { kitHome, readOwnAgent } from './home.js';
7
9
  import { callHouse, rpc, UNREACHABLE } from './mcp.js';
8
10
  import { refusalOf } from './refusals.js';
11
+ import { relayed, selectRelay } from './relay.js';
12
+ import { parse, stringify } from 'yaml';
9
13
  const USAGE = "usage: house <tool> ['<arguments as JSON>']";
10
14
  const PUSH_USAGE = 'usage: house push [commit] [--owner]';
11
15
  const PUSH = "push [commit]: sends the Local copy's committed changes to House";
16
+ const FETCH_USAGE = 'usage: house fetch';
17
+ const FETCH = `fetch: records House's changes on each Local copy's ${HOUSE_REF}`;
18
+ const DOWNLOAD_USAGE = `usage: house download '{"path":"/rooms/<handle>/<path>","file":"<local file>"}', adding "ref" for a revision`;
19
+ const DOWNLOAD = 'download: writes a binary file of a Room to the local file named by file';
12
20
  const ARGUMENTS = `the arguments are one JSON object in single quotes, like house search '{"query":"invoice"}'`;
13
21
  const CLOSED = "this conversation's House connection is closed; nothing to do from here";
22
+ const SANDBOXED = "your CLI's sandbox kept house from House; run house directly, not through another program";
14
23
  const REVOKED = 'this conversation no longer has House access; nothing to do from here';
15
24
  const UNCONNECTED = "this computer's own agent has no House connection; run kit login";
16
25
  const DISCONNECTED = "House no longer accepts this computer's own agent; run kit login";
26
+ const UNCONFIRMED = 'with no result; a write may or may not have taken effect, so read before you repeat it';
17
27
  const socketPath = process.env.HOUSE_BRIDGE;
18
- function refused(path, status, text) {
28
+ const MEDIA_TYPES = new Map([
29
+ ['avif', 'image/avif'],
30
+ ['csv', 'text/csv'],
31
+ ['docx', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document'],
32
+ ['gif', 'image/gif'],
33
+ ['heic', 'image/heic'],
34
+ ['html', 'text/html'],
35
+ ['jpeg', 'image/jpeg'],
36
+ ['jpg', 'image/jpeg'],
37
+ ['json', 'application/json'],
38
+ ['m4a', 'audio/mp4'],
39
+ ['md', 'text/markdown'],
40
+ ['mov', 'video/quicktime'],
41
+ ['mp3', 'audio/mpeg'],
42
+ ['mp4', 'video/mp4'],
43
+ ['ogg', 'audio/ogg'],
44
+ ['pdf', 'application/pdf'],
45
+ ['png', 'image/png'],
46
+ ['pptx', 'application/vnd.openxmlformats-officedocument.presentationml.presentation'],
47
+ ['svg', 'image/svg+xml'],
48
+ ['txt', 'text/plain'],
49
+ ['wav', 'audio/wav'],
50
+ ['webm', 'video/webm'],
51
+ ['webp', 'image/webp'],
52
+ ['xlsx', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'],
53
+ ['zip', 'application/zip'],
54
+ ]);
55
+ function refused(path, method, status, text, local) {
19
56
  const refusal = refusalOf(text);
20
57
  if (refusal !== null)
21
58
  return refusal.text;
22
59
  if (status === 401)
23
60
  return REVOKED;
61
+ const act = method === 'GET' ? 'download' : 'upload';
24
62
  if (URL.canParse(path))
25
- return `the upload answered ${status}; upload the file again`;
26
- if (status === 502 && /^[A-Za-z]/.test(text))
63
+ return `the ${act} answered ${status}; ${act} the file again`;
64
+ if (status === 502 && local)
27
65
  return text;
28
- return `${path} answered ${status}`;
66
+ return path === '/' ? unconfirmed(status) : `${path} answered ${status}`;
29
67
  }
30
- function bridged(path, body, headers = { 'content-type': 'application/json' }, to = socketPath) {
68
+ function unconfirmed(status) {
69
+ return `House answered ${status} ${UNCONFIRMED}`;
70
+ }
71
+ function exchanged(path, method, body, headers = { 'content-type': 'application/json' }, to = socketPath) {
31
72
  return new Promise((resolve, reject) => {
32
- const sent = request({ socketPath: to, path, method: 'POST', headers }, (answer) => {
33
- let text = '';
34
- answer.setEncoding('utf8');
35
- answer.on('data', (chunk) => {
36
- text += chunk;
37
- });
73
+ const sent = request({ socketPath: to, path, method, headers }, (answer) => {
74
+ const chunks = [];
75
+ answer.on('data', (chunk) => chunks.push(chunk));
38
76
  answer.on('end', () => {
77
+ const bytes = Buffer.concat(chunks);
39
78
  if (answer.statusCode === 200)
40
- resolve(text);
79
+ resolve(bytes);
41
80
  else
42
- reject(new Error(refused(path, answer.statusCode, text)));
81
+ reject(new Error(refused(path, method, answer.statusCode, bytes.toString('utf8'), answer.headers['content-type'] === undefined)));
43
82
  });
44
83
  });
45
- sent.on('error', () => reject(new Error(CLOSED)));
46
- sent.end(body instanceof Buffer ? body : JSON.stringify(body));
84
+ sent.on('error', (error) => reject(new Error(error.code === 'EPERM' || error.code === 'EACCES' ? SANDBOXED : CLOSED)));
85
+ sent.end(body === undefined ? undefined : body instanceof Buffer ? body : JSON.stringify(body));
47
86
  });
48
87
  }
88
+ async function bridged(path, body, headers, to = socketPath) {
89
+ return (await exchanged(path, 'POST', body, headers, to)).toString('utf8');
90
+ }
49
91
  async function direct(message) {
50
92
  const ownAgent = await readOwnAgent();
51
93
  if (ownAgent === null)
52
94
  throw new Error(UNCONNECTED);
95
+ selectRelay(process.env.HOUSE_KIT_RELAY || ownAgent.relay);
53
96
  setGlobalProxyFromEnv();
54
97
  const answer = await callHouse(ownAgent.house, ownAgent.credential, message).catch(() => {
55
98
  throw new Error(UNREACHABLE);
56
99
  });
57
100
  if (answer.status === 200)
58
101
  return answer.text;
59
- throw new Error(answer.status === 401 ? DISCONNECTED : (refusalOf(answer.text)?.text ?? `House answered ${answer.status}`));
102
+ throw new Error(answer.status === 401 ? DISCONNECTED : (refusalOf(answer.text)?.text ?? unconfirmed(answer.status)));
60
103
  }
61
104
  async function mcp(method, params) {
62
105
  const message = rpc(method, params);
@@ -78,31 +121,102 @@ async function localFile(path) {
78
121
  : `${path} is not a readable file`);
79
122
  }
80
123
  }
81
- async function upload(path, roomRef, missing) {
82
- if (typeof path !== 'string' || path === '')
83
- throw new Error(missing);
84
- const bytes = await localFile(path);
85
- const declared = JSON.parse(await bridged('/kit/attachments/upload', {
86
- ...(roomRef === undefined ? {} : { room_ref: roomRef }),
87
- name: basename(path),
88
- bytes: bytes.length,
89
- sha256: createHash('sha256').update(bytes).digest('hex'),
90
- }));
124
+ async function transferred(url, method, bytes, headers) {
125
+ if (socketPath !== undefined)
126
+ return exchanged(url, method, bytes, headers);
127
+ setGlobalProxyFromEnv();
128
+ const answer = await fetch(relayed(url), { method, ...(headers === undefined ? {} : { headers }), ...(bytes === undefined ? {} : { body: bytes }) }).catch(() => {
129
+ throw new Error(UNREACHABLE);
130
+ });
131
+ const received = Buffer.from(await answer.arrayBuffer());
132
+ if (answer.status === 200)
133
+ return received;
134
+ throw new Error(refused(url, method, answer.status, received.toString('utf8'), false));
135
+ }
136
+ async function sent(url, bytes, operation) {
137
+ const headers = { 'content-type': 'application/octet-stream', 'x-house-byte-operation': operation };
138
+ return (await transferred(url, 'POST', bytes, headers)).toString('utf8');
139
+ }
140
+ async function download(args) {
141
+ const { flags, positionals: [argument] } = accepted(args, ['--help'], 1, DOWNLOAD_USAGE);
142
+ if (flags.has('--help'))
143
+ return DOWNLOAD_USAGE;
144
+ const { file, ...selected } = argumentsOf(argument);
145
+ if (typeof file !== 'string' || file === '')
146
+ throw new Error('download needs "file", the local file to write');
147
+ const inspected = parse(await called('inspect', selected));
148
+ if (typeof inspected?.download !== 'string')
149
+ throw new Error(`${String(selected.path)} holds no binary file; shell reads its text`);
150
+ const bytes = verified(await transferred(inspected.download, 'GET'), String(inspected.sha256), String(selected.path));
151
+ const written = resolve(file);
152
+ await mkdir(dirname(written), { recursive: true });
153
+ await writeFile(written, bytes);
154
+ return written;
155
+ }
156
+ async function described(file) {
157
+ const bytes = await localFile(file);
158
+ const mediaType = MEDIA_TYPES.get(extname(file).slice(1).toLowerCase());
159
+ return {
160
+ bytes,
161
+ description: {
162
+ bytes: bytes.length,
163
+ sha256: createHash('sha256').update(bytes).digest('hex'),
164
+ ...(mediaType === undefined ? {} : { media_type: mediaType }),
165
+ },
166
+ };
167
+ }
168
+ async function upload({ file, ...destination }) {
169
+ if (typeof file !== 'string' || file === '')
170
+ throw new Error('upload needs "file", a local file');
171
+ const { bytes, description } = await described(file);
172
+ const answer = await called('upload', { ...destination, ...description });
173
+ const declared = parse(answer);
91
174
  if (declared.upload === undefined)
92
- return declared.attachment;
93
- const saved = JSON.parse(await bridged(declared.upload.url, bytes, {
94
- 'content-type': 'application/octet-stream',
95
- 'x-house-byte-operation': declared.upload.operation,
96
- }));
97
- if (saved.upload_failure !== undefined)
98
- throw new Error(`${path} was not saved: ${saved.upload_failure}; call again later`);
99
- return saved.attachment;
175
+ return answer;
176
+ const written = JSON.parse(await sent(declared.upload.url, bytes, declared.upload.operation));
177
+ return stringify(written, { lineWidth: 0 }).trimEnd();
178
+ }
179
+ async function appendRecord(args) {
180
+ const held = new Map();
181
+ const attachments = Array.isArray(args.attachments)
182
+ ? await Promise.all(args.attachments.map(async (attachment) => {
183
+ if (typeof attachment !== 'string')
184
+ return attachment;
185
+ const { bytes, description } = await described(attachment);
186
+ held.set(description.sha256, bytes);
187
+ return { name: basename(attachment), ...description };
188
+ }))
189
+ : args.attachments;
190
+ const record = { ...args, attachments };
191
+ for (;;) {
192
+ const answer = await called('append_record', record);
193
+ const { upload } = parse(answer);
194
+ if (upload === undefined)
195
+ return answer;
196
+ for (const grant of upload)
197
+ await sent(grant.url, held.get(grant.sha256), grant.operation);
198
+ }
199
+ }
200
+ function unexpected(argument, usage) {
201
+ return new Error(`unexpected argument ${argument}; ${usage}`);
202
+ }
203
+ function accepted(args, flags, positionals, usage) {
204
+ const given = { flags: new Set(), positionals: [] };
205
+ for (const arg of args) {
206
+ if (flags.includes(arg))
207
+ given.flags.add(arg);
208
+ else if (!arg.startsWith('-') && given.positionals.length < positionals)
209
+ given.positionals.push(arg);
210
+ else
211
+ throw unexpected(arg, usage);
212
+ }
213
+ return given;
100
214
  }
101
215
  async function push(args) {
102
- if (args.includes('--help'))
216
+ const { flags, positionals: [commit = 'HEAD'] } = accepted(args, ['--help', '--owner'], 1, PUSH_USAGE);
217
+ if (flags.has('--help'))
103
218
  return PUSH_USAGE;
104
- const owner = args.includes('--owner');
105
- const commit = args.find((arg) => arg !== '--owner') ?? 'HEAD';
219
+ const owner = flags.has('--owner');
106
220
  if (owner && socketPath !== undefined)
107
221
  throw new Error('--owner is not for Agent conversations; run house push without it');
108
222
  if (!owner && socketPath === undefined)
@@ -112,6 +226,14 @@ async function push(args) {
112
226
  throw new Error(pushed.text);
113
227
  return pushed.text;
114
228
  }
229
+ async function fetched(args) {
230
+ if (accepted(args, ['--help'], 0, FETCH_USAGE).flags.has('--help'))
231
+ return FETCH_USAGE;
232
+ const answer = JSON.parse(await bridged('/git/fetch', {}, undefined, socketPath ?? join(kitHome(), 'owner.sock')));
233
+ if (answer.refused)
234
+ throw new Error(answer.text);
235
+ return answer.text;
236
+ }
115
237
  function argumentsOf(argument) {
116
238
  if (argument === undefined)
117
239
  return {};
@@ -126,36 +248,44 @@ function argumentsOf(argument) {
126
248
  throw new Error(ARGUMENTS);
127
249
  return parsed;
128
250
  }
129
- async function house([verb, argument]) {
130
- if (verb === undefined || verb === '--help' || verb === 'help') {
131
- return [USAGE, 'help', PUSH, ...(await tools()).map((tool) => (tool.description === undefined ? tool.name : `${tool.name}: ${tool.description}`))].join('\n');
251
+ async function house(args) {
252
+ const { flags, positionals: [verb, argument] } = accepted(args, ['--help'], 2, USAGE);
253
+ if (verb === 'help' && argument !== undefined)
254
+ throw unexpected(argument, USAGE);
255
+ if (flags.has('--help') && argument !== undefined)
256
+ throw unexpected('--help', USAGE);
257
+ if (verb === undefined || verb === 'help') {
258
+ return [USAGE, 'help', PUSH, FETCH, DOWNLOAD, ...(await tools()).map((tool) => (tool.description === undefined ? tool.name : `${tool.name}: ${tool.description}`))].join('\n');
132
259
  }
133
- if (argument === '--help') {
260
+ if (flags.has('--help')) {
134
261
  const tool = (await tools()).find((listed) => listed.name === verb);
135
262
  if (tool === undefined)
136
263
  throw new Error(`${verb} is no Tool; house find_command '{"query":"${verb}"}' finds Commands`);
137
264
  return [...(tool.description === undefined ? [] : [tool.description]), JSON.stringify(tool.inputSchema)].join('\n');
138
265
  }
139
- const args = argumentsOf(argument);
140
- if (socketPath !== undefined && verb === 'upload_attachment') {
141
- return JSON.stringify({ attachment: await upload(args.path, args.room_ref, 'upload_attachment needs "path", a local file') });
142
- }
143
- if (socketPath !== undefined && verb === 'append_record' && Array.isArray(args.attachments)) {
144
- const attachments = [];
145
- for (const path of args.attachments) {
146
- attachments.push(await upload(path, args.room_ref, 'each attachments entry is the path of a local file'));
147
- }
148
- args.attachments = attachments;
149
- }
150
- const result = await mcp('tools/call', { name: verb, arguments: args });
266
+ const parsed = argumentsOf(argument);
267
+ return verb === 'upload' ? upload(parsed) : verb === 'append_record' ? appendRecord(parsed) : called(verb, parsed);
268
+ }
269
+ async function called(name, args) {
270
+ const result = await mcp('tools/call', { name, arguments: args });
151
271
  const text = result.content.map((content) => content.text).join('\n');
152
272
  if (result.isError === true)
153
273
  throw new Error(text.replace(/\n+$/, ''));
154
274
  return text;
155
275
  }
156
276
  const argv = process.argv.slice(2);
157
- (argv[0] === 'push' ? push(argv.slice(1)) : house(argv)).then((text) => {
277
+ const named = argv.findIndex((arg) => !arg.startsWith('-'));
278
+ const rest = argv.filter((_arg, index) => index !== named);
279
+ (argv[named] === 'push'
280
+ ? push(rest)
281
+ : argv[named] === 'fetch'
282
+ ? fetched(rest)
283
+ : argv[named] === 'download'
284
+ ? download(rest)
285
+ : house(argv)).then((text) => {
158
286
  process.stdout.write(`${text}\n`);
287
+ if (argv[0] === 'shell')
288
+ process.exitCode = Number(/^exit: (\d+)(?:\n|$)/.exec(text)?.[1] ?? 0);
159
289
  }, (error) => {
160
290
  process.stderr.write(`house: ${error instanceof Error ? error.message : String(error)}\n`);
161
291
  process.exitCode = 1;
@@ -1,34 +1,11 @@
1
- import { HOW_WE_WORK } from './skills.js';
2
- const HOUSE_LINE = 'Work with House through the `house` CLI: run `house --help`.';
3
- const FILE_LINE = 'To give the User a file or a page, upload it with `house upload_attachment` and link it; never start a server.';
4
- const READ_LINE = 'Before working in a Room, read `/private/rooms/<handle>/AGENTS.md`.';
5
- const COPIES_LINE = 'House Local copies; commit, then `house push`:';
6
- const UNREADABLE = /^(?:\S+: )?(?:path_not_found|room_not_found|operation_denied)\b/;
7
- const FAILED = /^exit: [1-9]\d*$/;
8
- const CUT = /^stderr: shell: output_cut (\d+) of \d+ bytes; continue with: (.+)$/;
9
- function cutOf(lines) {
10
- const cut = CUT.exec(lines[0] ?? '');
11
- return cut !== null && Buffer.byteLength(lines.slice(1).join('\n')) === Number(cut[1]) ? cut : null;
12
- }
13
- async function howWeWork(bridge) {
14
- let document = '';
15
- for (let command = `cat ${HOW_WE_WORK}`; command !== undefined;) {
16
- const read = await bridge.tool('shell', { command });
17
- const text = read.content.map((content) => content.text).join('\n');
18
- const lines = text.split('\n');
19
- if (read.isError === true || (FAILED.test(lines[0] ?? '') && lines[1]?.startsWith('stderr: '))) {
20
- const refusal = read.isError === true ? text : lines.slice(1).join('\n').replace(/^stderr: /gm, '');
21
- if (UNREADABLE.test(refusal))
22
- return '';
23
- throw new Error(refusal);
24
- }
25
- const cut = cutOf(lines);
26
- document += lines.slice(cut === null ? 0 : 1).join('\n');
27
- command = cut?.[2];
28
- }
29
- return document.replace(/\n$/, '');
30
- }
1
+ import { HOUSE_REF } from './git.js';
2
+ import { readHowWeWork } from './skills.js';
3
+ const SOURCE_LINE = "From House:";
4
+ const HOUSE_LINE = "Work with House through the `house` CLI: run `house --help`, and `house find_command` for House's guides and formats.";
5
+ const FILE_LINE = 'To give the User a file, upload it with `house upload` and link it; for an App, a Site or a website, follow `house find_command \'{"query":"app"}\'`. Never start a server.';
6
+ const READ_LINE = "Optional per-Room instructions: `/rooms/private/rooms/<handle>/AGENTS.md`.";
7
+ const COPIES_LINE = `House Local copies; before work run \`house fetch\` and rebase onto \`${HOUSE_REF}\`; after it commit, then \`house push\`:`;
31
8
  export async function instructions(bridge, base, copies) {
32
- const lines = [HOUSE_LINE, FILE_LINE, READ_LINE, ...(copies.length === 0 ? [] : [COPIES_LINE, ...copies])];
33
- return [lines.join('\n'), base, await howWeWork(bridge)].filter((part) => part !== '').join('\n\n');
9
+ const lines = [SOURCE_LINE, HOUSE_LINE, FILE_LINE, READ_LINE, ...(copies.length === 0 ? [] : [COPIES_LINE, ...copies])];
10
+ return [lines.join('\n'), base, (await readHowWeWork(bridge)).replace(/\n$/, '')].filter((part) => part !== '').join('\n\n');
34
11
  }
package/dist/kit-main.js CHANGED
@@ -1,19 +1,67 @@
1
1
  #!/usr/bin/env node
2
2
  import { setGlobalProxyFromEnv } from 'node:http';
3
+ import { parseArgs } from 'node:util';
4
+ import { answerGitCredential } from './app-git.js';
5
+ import { chatgpt } from './chatgpt.js';
3
6
  import { login } from './login.js';
4
7
  import { logout } from './logout.js';
5
8
  import { resident } from './resident.js';
9
+ const USAGE = 'usage: kit <login|logout|resident|chatgpt>\n';
10
+ const COMMANDS = new Map([
11
+ [
12
+ 'logout',
13
+ {
14
+ usage: 'usage: kit logout',
15
+ about: "disconnects this computer, stops House Kit and ends your own agent's connection",
16
+ operands: 0,
17
+ run: logout,
18
+ },
19
+ ],
20
+ [
21
+ 'resident',
22
+ {
23
+ usage: 'usage: kit resident',
24
+ about: "keeps this Environment connected; House Kit's service runs it",
25
+ operands: 0,
26
+ run: resident,
27
+ },
28
+ ],
29
+ [
30
+ 'git-credential',
31
+ {
32
+ usage: 'usage: kit git-credential <get|store|erase>',
33
+ about: "answers git with your own agent's House credential; git runs it",
34
+ operands: 1,
35
+ run: ([operation]) => answerGitCredential(operation),
36
+ },
37
+ ],
38
+ ]);
6
39
  const [command, ...argv] = process.argv.slice(2);
7
40
  setGlobalProxyFromEnv();
8
41
  async function run() {
9
42
  if (command === 'login')
10
43
  return login(argv);
11
- if (command === 'logout')
12
- return logout();
13
- if (command === 'resident')
14
- return resident();
15
- process.stderr.write('usage: kit <login|logout|resident>\n');
16
- process.exitCode = 2;
44
+ if (command === 'chatgpt')
45
+ return chatgpt(argv);
46
+ if (command === '--help') {
47
+ parseArgs({ args: argv });
48
+ process.stdout.write(USAGE);
49
+ return;
50
+ }
51
+ const chosen = COMMANDS.get(command ?? '');
52
+ if (chosen === undefined) {
53
+ process.stderr.write(USAGE);
54
+ process.exitCode = 2;
55
+ return;
56
+ }
57
+ const { values, positionals } = parseArgs({ args: argv, options: { help: { type: 'boolean', default: false } }, allowPositionals: true });
58
+ if (positionals.length > chosen.operands)
59
+ throw new Error(`unexpected argument ${positionals[chosen.operands]}; ${chosen.usage}`);
60
+ if (values.help) {
61
+ process.stdout.write(`${chosen.usage}\n ${chosen.about}\n`);
62
+ return;
63
+ }
64
+ return chosen.run(positionals);
17
65
  }
18
66
  run().catch((error) => {
19
67
  process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);