@agentshouse/kit 0.2.1-cf6326dfa5c3e → 0.2.1-cf6a92e13f031
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 +22 -22
- package/dist/acp.js +2 -2
- package/dist/agents.js +2 -2
- package/dist/api.js +5 -5
- package/dist/bootstrap.json +4 -4
- package/dist/bridge.js +1 -1
- package/dist/{inputs.js → calls.js} +20 -20
- package/dist/clis.js +6 -3
- package/dist/{stream.js → connection.js} +30 -27
- package/dist/conversations.js +220 -105
- package/dist/copies.js +15 -29
- package/dist/end.js +6 -2
- package/dist/events.js +2 -2
- package/dist/files.js +123 -37
- package/dist/git.js +1 -1
- package/dist/house-cli.js +81 -86
- package/dist/instructions.js +28 -8
- package/dist/kit-cli.js +2 -2
- package/dist/login.js +1 -3
- package/dist/mcp.js +4 -2
- package/dist/placement.js +11 -2
- package/dist/resident.js +38 -32
- package/dist/scope.js +3 -0
- package/dist/service.js +1 -1
- package/dist/sign-in.js +19 -19
- package/dist/skills.js +12 -93
- package/dist/transcription.js +51 -20
- package/dist/update.js +32 -32
- package/dist/web-wizard.js +100 -0
- package/dist/wire.js +19 -3
- package/package.json +6 -6
- package/how-we-work.md +0 -33
- package/skills/ask-matt/LICENSE +0 -21
- package/skills/ask-matt/PHASE-BOUNDARIES.md +0 -55
- package/skills/ask-matt/SKILL.md +0 -97
- package/skills/ask-matt/agents/openai.yaml +0 -5
- package/skills/code-review/LICENSE +0 -21
- package/skills/code-review/SKILL.md +0 -89
- package/skills/code-review/agents/openai.yaml +0 -3
- package/skills/codebase-design/DEEPENING.md +0 -37
- package/skills/codebase-design/DESIGN-IT-TWICE.md +0 -44
- package/skills/codebase-design/LICENSE +0 -21
- package/skills/codebase-design/SKILL.md +0 -114
- package/skills/codebase-design/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/LICENSE +0 -21
- package/skills/diagnosing-bugs/SKILL.md +0 -138
- package/skills/diagnosing-bugs/agents/openai.yaml +0 -3
- package/skills/diagnosing-bugs/scripts/hitl-loop.template.sh +0 -44
- package/skills/domain-modeling/ADR-FORMAT.md +0 -47
- package/skills/domain-modeling/GLOSSARY-FORMAT.md +0 -60
- package/skills/domain-modeling/LICENSE +0 -21
- package/skills/domain-modeling/SKILL.md +0 -74
- package/skills/domain-modeling/agents/openai.yaml +0 -3
- package/skills/grill-me/LICENSE +0 -21
- package/skills/grill-me/SKILL.md +0 -7
- package/skills/grill-me/agents/openai.yaml +0 -5
- package/skills/grill-with-docs/LICENSE +0 -21
- package/skills/grill-with-docs/SKILL.md +0 -7
- package/skills/grill-with-docs/agents/openai.yaml +0 -5
- package/skills/grilling/LICENSE +0 -21
- package/skills/grilling/SKILL.md +0 -30
- package/skills/grilling/agents/openai.yaml +0 -3
- package/skills/handoff/LICENSE +0 -21
- package/skills/handoff/SKILL.md +0 -16
- package/skills/handoff/agents/openai.yaml +0 -5
- package/skills/implement/LICENSE +0 -21
- package/skills/implement/SKILL.md +0 -17
- package/skills/implement/agents/openai.yaml +0 -5
- package/skills/implement-spec/LICENSE +0 -21
- package/skills/implement-spec/SKILL.md +0 -40
- package/skills/implement-spec/agents/openai.yaml +0 -5
- package/skills/improve-codebase-architecture/HTML-REPORT.md +0 -123
- package/skills/improve-codebase-architecture/LICENSE +0 -21
- package/skills/improve-codebase-architecture/SKILL.md +0 -71
- package/skills/improve-codebase-architecture/agents/openai.yaml +0 -5
- package/skills/pr/CREDITS.md +0 -3
- package/skills/pr/LICENSE +0 -21
- package/skills/pr/SKILL.md +0 -170
- package/skills/pr/agents/openai.yaml +0 -3
- package/skills/prototype/LICENSE +0 -21
- package/skills/prototype/LOGIC.md +0 -67
- package/skills/prototype/SKILL.md +0 -26
- package/skills/prototype/UI.md +0 -112
- package/skills/prototype/agents/openai.yaml +0 -3
- package/skills/research/LICENSE +0 -21
- package/skills/research/SKILL.md +0 -12
- package/skills/research/agents/openai.yaml +0 -3
- package/skills/retro/LICENSE +0 -21
- package/skills/retro/SKILL.md +0 -44
- package/skills/retro/agents/openai.yaml +0 -5
- package/skills/tdd/LICENSE +0 -21
- package/skills/tdd/SKILL.md +0 -38
- package/skills/tdd/agents/openai.yaml +0 -3
- package/skills/tdd/mocking.md +0 -59
- package/skills/tdd/tests.md +0 -77
- package/skills/teach/GLOSSARY-FORMAT.md +0 -35
- package/skills/teach/LEARNING-RECORD-FORMAT.md +0 -46
- package/skills/teach/LICENSE +0 -21
- package/skills/teach/MISSION-FORMAT.md +0 -31
- package/skills/teach/RESOURCES-FORMAT.md +0 -32
- package/skills/teach/SKILL.md +0 -140
- package/skills/teach/agents/openai.yaml +0 -5
- package/skills/to-questionnaire/LICENSE +0 -21
- package/skills/to-questionnaire/SKILL.md +0 -54
- package/skills/to-questionnaire/agents/openai.yaml +0 -5
- package/skills/to-spec/LICENSE +0 -21
- package/skills/to-spec/SKILL.md +0 -75
- package/skills/to-spec/agents/openai.yaml +0 -5
- package/skills/to-tickets/LICENSE +0 -21
- package/skills/to-tickets/SKILL.md +0 -105
- package/skills/to-tickets/agents/openai.yaml +0 -5
- package/skills/triage/AGENT-BRIEF.md +0 -207
- package/skills/triage/LICENSE +0 -21
- package/skills/triage/OUT-OF-SCOPE.md +0 -105
- package/skills/triage/SKILL.md +0 -112
- package/skills/triage/agents/openai.yaml +0 -5
- package/skills/wait-what/LICENSE +0 -21
- package/skills/wait-what/SKILL.md +0 -7
- package/skills/wait-what/agents/openai.yaml +0 -5
- package/skills/wayfinder/LICENSE +0 -21
- package/skills/wayfinder/SKILL.md +0 -128
- package/skills/wayfinder/agents/openai.yaml +0 -5
- package/skills/wizard/LICENSE +0 -21
- package/skills/wizard/SKILL.md +0 -44
- package/skills/wizard/agents/openai.yaml +0 -3
- package/skills/wizard/template.sh +0 -223
- package/skills/writing-for-agents/LICENSE +0 -21
- package/skills/writing-for-agents/SKILL-MECHANICS.md +0 -22
- package/skills/writing-for-agents/SKILL.md +0 -81
- package/skills/writing-for-agents/agents/openai.yaml +0 -3
package/README.md
CHANGED
|
@@ -1,33 +1,33 @@
|
|
|
1
|
-
#
|
|
1
|
+
# Kit
|
|
2
2
|
|
|
3
|
-
|
|
3
|
+
Kit connects an Environment, a Linux computer or server, to [agents.house](https://agents.house). It runs
|
|
4
4
|
your Agents' conversations through the agent CLIs you chose and gives each Agent the `house` command.
|
|
5
5
|
|
|
6
6
|
## Install
|
|
7
7
|
|
|
8
|
-
Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "
|
|
9
|
-
or `& { try { $kit = irm agents.house/kit.ps1 } catch { throw '
|
|
10
|
-
On macOS and Linux it installs
|
|
8
|
+
Run `sh -c 'kit=$(curl -fsSL "$0") || { echo "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 '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 Kit natively under your own account, without an admin password, as a service that runs
|
|
11
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
|
-
Add `--container` to run
|
|
14
|
+
Add `--container` to run Kit in one Docker container instead, with your
|
|
15
15
|
workspace mounted at `/agents/house`; your Agents then reach only that
|
|
16
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.
|
|
17
17
|
Running the command for the other choice on a connected computer asks you to
|
|
18
|
-
confirm, then replaces its Environment, whose Agents end, with a new one. Running it with
|
|
19
|
-
|
|
18
|
+
confirm, then replaces its Environment, whose Agents end, with a new one. Running it with a different `HOUSE_KIT_HOME`
|
|
19
|
+
from the running Kit process asks you to confirm before it replaces that process, and leaves the earlier Kit home as it was.
|
|
20
20
|
|
|
21
21
|
On your own Linux server, run the Linux command with `--linux` to
|
|
22
|
-
install
|
|
22
|
+
install Kit natively, with its workspace at `/agents/house`; `kit` and
|
|
23
23
|
`house` are then on the server's `PATH`.
|
|
24
24
|
|
|
25
|
-
|
|
25
|
+
Kit runs the agent CLIs your login shell finds and installs a missing one
|
|
26
26
|
through that CLI's own installer. Running the command again offers to update
|
|
27
|
-
each CLI older than
|
|
28
|
-
its latest release without asking.
|
|
29
|
-
Environment
|
|
30
|
-
them out; running it again without the flag brings them back.
|
|
27
|
+
each CLI older than Kit needs; add `--update-clis` to update every one to
|
|
28
|
+
its latest release without asking. Kit also gives every Agent on the
|
|
29
|
+
Environment the agent skills of `@agentshouse/skills`, at the version each Kit
|
|
30
|
+
release installs. Add `--no-skills` to the command to leave them out; running it again without the flag brings them back.
|
|
31
31
|
|
|
32
32
|
## Commands
|
|
33
33
|
|
|
@@ -40,21 +40,21 @@ A login also connects your own agent: outside an Agent conversation, `house <too
|
|
|
40
40
|
House as you and `git` clones and pushes your Apps at `<house>/app/` as you, each through the Kit
|
|
41
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
|
-
computer, stops
|
|
43
|
+
computer, stops the Kit process 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
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
|
|
50
|
-
may no longer be copied here. `house fetch` does the same and records House's changes on each copy's
|
|
49
|
+
Git repository in the workspace's `local-copies`, and keeps a Room's copy as it is, no longer refreshing it, once the
|
|
50
|
+
Room may no longer be copied here. `house fetch` does the same and records House's changes on each copy's
|
|
51
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.
|
|
52
|
+
the container. An Agent runs both, without `--owner`. `house upload` and `house download` move a Room's other files straight between disk and House's store, and a broken upload resumes on its own.
|
|
53
53
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
54
|
+
Kit turns each audio file your message to an Agent links into text on this computer before the Agent reads it, and keeps a message whose audio it cannot turn into text from starting. While transcription is on, the speech engine and model use about 425 MB beside the Environment's credential; turning it off deletes them.
|
|
55
|
+
|
|
56
|
+
When you press Run on a Web Wizard's page, Kit runs its script with `bash` in a terminal on this computer, as you, in the home and directory it runs agent CLIs from, with your login shell's `PATH`; the page shows that terminal and takes your typing, and closing the page, or Kit losing its connection to House, ends the script and its child processes. Kit keeps nothing the script prints or you type.
|
|
57
57
|
|
|
58
58
|
## License
|
|
59
59
|
|
|
60
|
-
MIT.
|
|
60
|
+
MIT.
|
package/dist/acp.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ndJsonStream, PROTOCOL_VERSION, } from '@agentclientprotocol/sdk';
|
|
2
2
|
import { spawn } from 'node:child_process';
|
|
3
3
|
import { Readable, Writable } from 'node:stream';
|
|
4
|
-
import { CLIS,
|
|
4
|
+
import { CLIS, KIT_RELEASE, adapterCommand, withoutProxy } from './clis.js';
|
|
5
5
|
import { killTree } from './scope.js';
|
|
6
6
|
const RETIRED = 'the CLI was retired';
|
|
7
7
|
export async function startAdapter(kind, cli, cwd, app, events = () => undefined, added = {}, signal, scope = null) {
|
|
@@ -71,7 +71,7 @@ export async function startAdapter(kind, cli, cwd, app, events = () => undefined
|
|
|
71
71
|
session: { compaction: {}, notices: {} },
|
|
72
72
|
_meta: { jetbrains: { air: { version: 1, capabilities: CLIS[kind].air } } },
|
|
73
73
|
},
|
|
74
|
-
clientInfo: { name: '@agentshouse/kit', version:
|
|
74
|
+
clientInfo: { name: '@agentshouse/kit', version: KIT_RELEASE },
|
|
75
75
|
});
|
|
76
76
|
scope?.entered(child.pid);
|
|
77
77
|
return { connection, initialized, exited, lost, retire };
|
package/dist/agents.js
CHANGED
|
@@ -2,7 +2,7 @@ import { client } from '@agentclientprotocol/sdk';
|
|
|
2
2
|
import { readFile, realpath } from 'node:fs/promises';
|
|
3
3
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
4
4
|
import { startAdapter } from './acp.js';
|
|
5
|
-
import { CLIS,
|
|
5
|
+
import { CLIS, KIT_RELEASE, below, installAdapter, installCli, locate, run, versionOf } from './clis.js';
|
|
6
6
|
import { agentBase, kitHome } from './home.js';
|
|
7
7
|
import { updatesItself } from './placement.js';
|
|
8
8
|
import { holdTranscription, transcriptionReport } from './transcription.js';
|
|
@@ -354,7 +354,7 @@ export class Agents {
|
|
|
354
354
|
const body = {
|
|
355
355
|
os: await operatingSystem(),
|
|
356
356
|
...(form === undefined ? {} : { form }),
|
|
357
|
-
|
|
357
|
+
kit_release: KIT_RELEASE,
|
|
358
358
|
wire: KIT_WIRE,
|
|
359
359
|
updates_itself: await updatesItself(),
|
|
360
360
|
agent_base: agentBase(),
|
package/dist/api.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { setTimeout as delay } from 'node:timers/promises';
|
|
2
|
-
import { signInAgain
|
|
2
|
+
import { signInAgain } from './end.js';
|
|
3
3
|
import { readEnrolment } from './home.js';
|
|
4
4
|
import { retryable } from './refusals.js';
|
|
5
5
|
import { relayed } from './relay.js';
|
|
6
|
-
import { KIT_WIRE, KIT_WIRE_HEADER
|
|
6
|
+
import { endUnserved, KIT_WIRE, KIT_WIRE_HEADER } from './wire.js';
|
|
7
7
|
export class HouseRefusal extends Error {
|
|
8
8
|
status;
|
|
9
9
|
text;
|
|
@@ -17,7 +17,7 @@ export function finalRefusal(error) {
|
|
|
17
17
|
return error instanceof HouseRefusal && retryable(error.text) === false;
|
|
18
18
|
}
|
|
19
19
|
export function retryDelay(attempt) {
|
|
20
|
-
// Full jitter, doubling from one second to a 30-second cap, spreads the
|
|
20
|
+
// Full jitter, doubling from one second to a 30-second cap, spreads the Kit processes one outage dropped and retries within half a minute of House's return.
|
|
21
21
|
return Math.random() * Math.min(30_000, 1000 * 2 ** attempt);
|
|
22
22
|
}
|
|
23
23
|
export async function retrying(sent, signal, pause = retryDelay) {
|
|
@@ -45,8 +45,8 @@ export async function post(house, path, body, credential, signal) {
|
|
|
45
45
|
signal,
|
|
46
46
|
});
|
|
47
47
|
const text = await answer.text();
|
|
48
|
-
if (!answer.ok
|
|
49
|
-
|
|
48
|
+
if (!answer.ok)
|
|
49
|
+
endUnserved(text);
|
|
50
50
|
if (!answer.ok)
|
|
51
51
|
throw new HouseRefusal(path, answer.status, text);
|
|
52
52
|
return JSON.parse(text);
|
package/dist/bootstrap.json
CHANGED
|
@@ -1,23 +1,23 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schemaVersion": 2,
|
|
3
|
-
"version": "0.2.1-
|
|
3
|
+
"version": "0.2.1-cf6a92e13f031",
|
|
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-
|
|
8
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cf6a92e13f031/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-
|
|
14
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cf6a92e13f031/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-
|
|
20
|
+
"url": "https://github.com/agentshouse/kit/releases/download/v0.2.1-cf6a92e13f031/connect-windows.ps1"
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
package/dist/bridge.js
CHANGED
|
@@ -13,7 +13,7 @@ import { callHouse, mcpBody, rpc, UNREACHABLE } from './mcp.js';
|
|
|
13
13
|
import { operationId } from './operation.js';
|
|
14
14
|
import { refusalOf, retryable } from './refusals.js';
|
|
15
15
|
import { relayed } from './relay.js';
|
|
16
|
-
const MCP_REQUEST_BYTES =
|
|
16
|
+
const MCP_REQUEST_BYTES = 4_000_000;
|
|
17
17
|
export async function received(request) {
|
|
18
18
|
let text = '';
|
|
19
19
|
request.setEncoding('utf8');
|
|
@@ -4,50 +4,50 @@ import { kitHome } from './home.js';
|
|
|
4
4
|
function logged(error) {
|
|
5
5
|
process.stderr.write(`kit: ${error instanceof Error ? error.message : String(error)}\n`);
|
|
6
6
|
}
|
|
7
|
-
export class
|
|
7
|
+
export class Calls {
|
|
8
8
|
house;
|
|
9
9
|
changed;
|
|
10
10
|
carried = new Map();
|
|
11
|
-
path = join(kitHome(), '
|
|
12
|
-
|
|
13
|
-
|
|
11
|
+
path = join(kitHome(), 'call-results.json');
|
|
12
|
+
results;
|
|
13
|
+
returned = new Set();
|
|
14
14
|
open = 0;
|
|
15
15
|
constructor(house, changed) {
|
|
16
16
|
this.house = house;
|
|
17
17
|
this.changed = changed;
|
|
18
|
-
this.
|
|
18
|
+
this.results = new Map(existsSync(this.path) ? Object.entries(JSON.parse(readFileSync(this.path, 'utf8'))) : []);
|
|
19
19
|
}
|
|
20
|
-
|
|
21
|
-
if (this.
|
|
20
|
+
keepResult(callId, result) {
|
|
21
|
+
if (this.returned.has(callId))
|
|
22
22
|
return;
|
|
23
|
-
this.
|
|
23
|
+
this.results.set(callId, result);
|
|
24
24
|
this.save();
|
|
25
25
|
}
|
|
26
26
|
idle() {
|
|
27
27
|
return this.open === 0;
|
|
28
28
|
}
|
|
29
|
-
carry(
|
|
30
|
-
const known = this.carried.get(
|
|
31
|
-
const
|
|
32
|
-
const carried = known ?? (
|
|
29
|
+
carry(callId, work) {
|
|
30
|
+
const known = this.carried.get(callId);
|
|
31
|
+
const result = this.results.get(callId);
|
|
32
|
+
const carried = known ?? (result === undefined ? work() : Promise.resolve({ result }));
|
|
33
33
|
if (known === undefined) {
|
|
34
|
-
this.carried.set(
|
|
35
|
-
carried.catch(() => this.carried.delete(
|
|
34
|
+
this.carried.set(callId, carried);
|
|
35
|
+
carried.catch(() => this.carried.delete(callId));
|
|
36
36
|
}
|
|
37
37
|
this.open++;
|
|
38
38
|
this.changed();
|
|
39
39
|
return carried
|
|
40
|
-
.then(async ({
|
|
40
|
+
.then(async ({ result, returned }) => {
|
|
41
41
|
try {
|
|
42
|
-
await this.house.deliver(`/kit/inputs/${
|
|
42
|
+
await this.house.deliver(`/kit/inputs/${callId}/ack`, result);
|
|
43
43
|
}
|
|
44
44
|
finally {
|
|
45
|
-
this.
|
|
46
|
-
if (this.
|
|
45
|
+
this.returned.add(callId);
|
|
46
|
+
if (this.results.delete(callId))
|
|
47
47
|
this.save();
|
|
48
48
|
}
|
|
49
49
|
if (known === undefined)
|
|
50
|
-
await
|
|
50
|
+
await returned?.();
|
|
51
51
|
})
|
|
52
52
|
.catch(logged)
|
|
53
53
|
.finally(() => {
|
|
@@ -57,7 +57,7 @@ export class Inputs {
|
|
|
57
57
|
}
|
|
58
58
|
save() {
|
|
59
59
|
const temporary = `${this.path}.${process.pid}`;
|
|
60
|
-
writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.
|
|
60
|
+
writeFileSync(temporary, JSON.stringify(Object.fromEntries(this.results)), { mode: 0o600 });
|
|
61
61
|
renameSync(temporary, this.path);
|
|
62
62
|
}
|
|
63
63
|
}
|
package/dist/clis.js
CHANGED
|
@@ -137,7 +137,7 @@ export const CLIS = {
|
|
|
137
137
|
},
|
|
138
138
|
};
|
|
139
139
|
const KIT_PACKAGE = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
|
|
140
|
-
export const
|
|
140
|
+
export const KIT_RELEASE = KIT_PACKAGE.version;
|
|
141
141
|
const PROXY = /^https?_proxy$/i;
|
|
142
142
|
const VERSION = /\d+\.\d+\.\d+(?:-[0-9A-Za-z.]+)?/;
|
|
143
143
|
// An install still running after fifteen minutes is ended and reported as failed, so a hung download cannot hold its CLI's report.
|
|
@@ -225,10 +225,13 @@ const USER_BIN = 'case ":$PATH:" in *":$HOME/.local/bin:"*) ;; *) PATH="$PATH:$H
|
|
|
225
225
|
function inLoginShell(script, argument = '', signal) {
|
|
226
226
|
return run(loginShell(), ['-l', '-i', '-c', `exec /bin/sh -c '${USER_BIN}; ${script}' sh ${argument}`], READ_MS, true, signal);
|
|
227
227
|
}
|
|
228
|
-
export async function
|
|
229
|
-
const ran = await inLoginShell(LOOKUP,
|
|
228
|
+
export async function onLoginPath(program, signal) {
|
|
229
|
+
const ran = await inLoginShell(LOOKUP, program, signal);
|
|
230
230
|
return ran.stdout.split('\n').findLast((line) => line.startsWith(FOUND))?.slice(FOUND.length) ?? null;
|
|
231
231
|
}
|
|
232
|
+
export function locate(kind, signal) {
|
|
233
|
+
return onLoginPath(CLIS[kind].bin, signal);
|
|
234
|
+
}
|
|
232
235
|
export async function loginPath() {
|
|
233
236
|
const marker = 'house-kit-path ';
|
|
234
237
|
const ran = await inLoginShell(`printf "${marker}%s\\n" "$PATH"`);
|
|
@@ -1,24 +1,24 @@
|
|
|
1
1
|
import { subscribe } from 'node:diagnostics_channel';
|
|
2
2
|
import { HouseRefusal, retryDelay } from './api.js';
|
|
3
|
-
import { end, REPLACED, signInAgain
|
|
3
|
+
import { end, REPLACED, signInAgain } from './end.js';
|
|
4
4
|
import { readEnrolment } from './home.js';
|
|
5
5
|
import { relayed } from './relay.js';
|
|
6
|
-
import {
|
|
6
|
+
import { endUnserved, KIT_WIRE } from './wire.js';
|
|
7
7
|
const PATH = '/kit/stream';
|
|
8
8
|
const SUBPROTOCOL = `house.kit.stream.${KIT_WIRE}`;
|
|
9
9
|
const REFUSAL_HEADER = 'x-house-refusal';
|
|
10
|
-
// House beats each
|
|
11
|
-
export const
|
|
12
|
-
const
|
|
10
|
+
// House beats each Kit connection every thirty seconds, so two silent beats mean this Kit process cannot hear House.
|
|
11
|
+
export const CONNECTION_SILENCE_MS = 60_000;
|
|
12
|
+
const SYSTEM_CONNECTION_CLOCK = {
|
|
13
13
|
later: (delay, callback) => setTimeout(callback, delay),
|
|
14
14
|
clear: (timer) => clearTimeout(timer),
|
|
15
15
|
};
|
|
16
|
-
export class
|
|
16
|
+
export class ConnectionSilence {
|
|
17
17
|
timer = null;
|
|
18
18
|
silent;
|
|
19
19
|
clock;
|
|
20
20
|
interval;
|
|
21
|
-
constructor(silent, clock =
|
|
21
|
+
constructor(silent, clock = SYSTEM_CONNECTION_CLOCK, interval = CONNECTION_SILENCE_MS) {
|
|
22
22
|
this.silent = silent;
|
|
23
23
|
this.clock = clock;
|
|
24
24
|
this.interval = interval;
|
|
@@ -37,7 +37,7 @@ export class StreamSilence {
|
|
|
37
37
|
this.timer = null;
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
|
-
function
|
|
40
|
+
function connectionUrl(house) {
|
|
41
41
|
const url = new URL(PATH, house);
|
|
42
42
|
url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
|
|
43
43
|
return url;
|
|
@@ -56,13 +56,13 @@ subscribe('undici:request:headers', (message) => {
|
|
|
56
56
|
return;
|
|
57
57
|
refused = new HouseRefusal(PATH, response.statusCode, header(response.headers, REFUSAL_HEADER) || response.statusText);
|
|
58
58
|
});
|
|
59
|
-
export function
|
|
60
|
-
let
|
|
59
|
+
export function holdConnection(handlers) {
|
|
60
|
+
let connection = null;
|
|
61
61
|
let failures = 0;
|
|
62
62
|
const connect = async () => {
|
|
63
63
|
const { house, credential } = (await readEnrolment());
|
|
64
64
|
refused = null;
|
|
65
|
-
const opening = new WebSocket(relayed(
|
|
65
|
+
const opening = new WebSocket(relayed(connectionUrl(house)), {
|
|
66
66
|
protocols: [SUBPROTOCOL],
|
|
67
67
|
headers: { authorization: `Bearer ${credential}` },
|
|
68
68
|
});
|
|
@@ -71,30 +71,31 @@ export function holdStream(handlers) {
|
|
|
71
71
|
const closed = (event) => {
|
|
72
72
|
silence?.stop();
|
|
73
73
|
silence = null;
|
|
74
|
-
if (
|
|
75
|
-
|
|
76
|
-
|
|
74
|
+
if (connection === opening)
|
|
75
|
+
connection = null;
|
|
76
|
+
handlers.closed();
|
|
77
|
+
process.stderr.write(`kit: connection closed ${event.code} ${event.reason}\n`);
|
|
77
78
|
if (event.reason === 'replaced')
|
|
78
79
|
end(REPLACED);
|
|
79
80
|
if (event.reason === 'credential_rejected' || refused?.status === 401) {
|
|
80
81
|
void signInAgain(credential);
|
|
81
82
|
return;
|
|
82
83
|
}
|
|
83
|
-
if (refused !== null
|
|
84
|
-
|
|
84
|
+
if (refused !== null)
|
|
85
|
+
endUnserved(refused.text);
|
|
85
86
|
if (!opened && refused !== null)
|
|
86
87
|
process.stderr.write(`kit: ${refused.message}\n`);
|
|
87
|
-
// A closed
|
|
88
|
+
// A closed connection reopens in one to three seconds, spread so Kit processes one restart closed return apart; an opening House refused or left unanswered backs off on the jittered curve, retryable or not, since a resident outlives a House deploy.
|
|
88
89
|
setTimeout(() => void connect(), opened ? 1000 + Math.random() * 2000 : retryDelay(failures++));
|
|
89
90
|
};
|
|
90
91
|
opening.onopen = () => {
|
|
91
92
|
opened = true;
|
|
92
93
|
failures = 0;
|
|
93
|
-
|
|
94
|
-
silence = new
|
|
95
|
-
if (
|
|
94
|
+
connection = opening;
|
|
95
|
+
silence = new ConnectionSilence(() => {
|
|
96
|
+
if (connection !== opening)
|
|
96
97
|
return;
|
|
97
|
-
|
|
98
|
+
connection = null;
|
|
98
99
|
opening.onclose = null;
|
|
99
100
|
opening.close();
|
|
100
101
|
closed(new CloseEvent('close', { code: 1006, reason: 'heartbeat_missed' }));
|
|
@@ -104,19 +105,21 @@ export function holdStream(handlers) {
|
|
|
104
105
|
};
|
|
105
106
|
opening.onmessage = (event) => {
|
|
106
107
|
silence?.heard();
|
|
107
|
-
const
|
|
108
|
-
if (
|
|
109
|
-
handlers.
|
|
108
|
+
const arrived = JSON.parse(String(event.data));
|
|
109
|
+
if (arrived.type === 'input')
|
|
110
|
+
handlers.call(arrived);
|
|
111
|
+
else if (arrived.type !== 'beat')
|
|
112
|
+
handlers.notification(arrived);
|
|
110
113
|
};
|
|
111
114
|
opening.onerror = () => undefined;
|
|
112
115
|
opening.onclose = closed;
|
|
113
116
|
};
|
|
114
117
|
void connect();
|
|
115
118
|
return {
|
|
116
|
-
send(
|
|
117
|
-
if (
|
|
119
|
+
send(notification) {
|
|
120
|
+
if (connection === null || connection.readyState !== WebSocket.OPEN)
|
|
118
121
|
return false;
|
|
119
|
-
|
|
122
|
+
connection.send(JSON.stringify(notification));
|
|
120
123
|
return true;
|
|
121
124
|
},
|
|
122
125
|
};
|