instar 1.3.379 → 1.3.381
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/server.d.ts.map +1 -1
- package/dist/commands/server.js +28 -1
- package/dist/commands/server.js.map +1 -1
- package/dist/core/PostUpdateMigrator.d.ts.map +1 -1
- package/dist/core/PostUpdateMigrator.js +20 -2
- package/dist/core/PostUpdateMigrator.js.map +1 -1
- package/dist/core/SessionManager.d.ts +12 -0
- package/dist/core/SessionManager.d.ts.map +1 -1
- package/dist/core/SessionManager.js +20 -0
- package/dist/core/SessionManager.js.map +1 -1
- package/dist/core/ghToken.d.ts +21 -0
- package/dist/core/ghToken.d.ts.map +1 -0
- package/dist/core/ghToken.js +56 -0
- package/dist/core/ghToken.js.map +1 -0
- package/dist/monitoring/SessionRecovery.d.ts +15 -0
- package/dist/monitoring/SessionRecovery.d.ts.map +1 -1
- package/dist/monitoring/SessionRecovery.js +31 -1
- package/dist/monitoring/SessionRecovery.js.map +1 -1
- package/package.json +1 -1
- package/src/data/builtin-manifest.json +20 -20
- package/upgrades/1.3.380.md +46 -0
- package/upgrades/1.3.381.md +55 -0
- package/upgrades/context-wall-compact-escalation.eli16.md +42 -0
- package/upgrades/gh-token-vault-spawn-p3b.eli16.md +66 -0
- package/upgrades/side-effects/context-wall-compact-escalation.md +81 -0
- package/upgrades/side-effects/gh-token-vault-spawn-p3b.md +76 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionRecovery.d.ts","sourceRoot":"","sources":["../../src/monitoring/SessionRecovery.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SessionRecovery.d.ts","sourceRoot":"","sources":["../../src/monitoring/SessionRecovery.ts"],"names":[],"mappings":"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"}
|
|
@@ -246,11 +246,41 @@ export class SessionRecovery extends EventEmitter {
|
|
|
246
246
|
}
|
|
247
247
|
const attemptNumber = this.recordAttempt(key);
|
|
248
248
|
this.emit('recovery:context_exhaustion', { topicId, sessionName, matchedPattern, attemptNumber });
|
|
249
|
+
// ── Rung 1: non-destructive /compact (preserves the conversation) ──
|
|
250
|
+
// Before killing the session and losing the conversation, try the escalation
|
|
251
|
+
// the wall itself asks for: press `/compact`. This is gated to a GENUINELY
|
|
252
|
+
// stuck session (no active child processes — a working session at 100%
|
|
253
|
+
// context is handled by the kill-defer below, never compacted out from under
|
|
254
|
+
// its work). If /compact clears the wall the conversation survives; if it
|
|
255
|
+
// fails (too long to even compact) or times out, we fall through to the
|
|
256
|
+
// destructive fresh respawn — never worse than the prior behavior.
|
|
257
|
+
const hasChildren = this.deps.hasActiveProcesses?.(sessionName) ?? false;
|
|
258
|
+
if (!hasChildren && this.deps.attemptCompaction) {
|
|
259
|
+
try {
|
|
260
|
+
const compaction = await this.deps.attemptCompaction(sessionName);
|
|
261
|
+
if (compaction.cleared) {
|
|
262
|
+
this.emit('recovery:context_compacted', { topicId, sessionName, attemptNumber });
|
|
263
|
+
return {
|
|
264
|
+
recovered: true,
|
|
265
|
+
failureType: 'context_exhaustion',
|
|
266
|
+
attemptNumber,
|
|
267
|
+
message: `Recovered via /compact — conversation preserved (pattern: "${matchedPattern}", attempt ${attemptNumber})`,
|
|
268
|
+
};
|
|
269
|
+
}
|
|
270
|
+
// compaction.cleared === false → fall through to the destructive respawn.
|
|
271
|
+
}
|
|
272
|
+
catch {
|
|
273
|
+
// @silent-fallback-ok — compaction is best-effort; fall through to respawn.
|
|
274
|
+
}
|
|
275
|
+
}
|
|
249
276
|
// Record detection moment so we can identify any in-flight agent reply that
|
|
250
277
|
// lands AFTER this point — the dying session may have generated a reply that
|
|
251
278
|
// hasn't been written to topic history yet at respawn time.
|
|
252
279
|
const detectedAt = Date.now();
|
|
253
|
-
//
|
|
280
|
+
// ── Rung 2: kill + fresh respawn (conversation lost) ──
|
|
281
|
+
// Reached only when /compact was unavailable, declined (active children), or
|
|
282
|
+
// could not clear the wall. The session is stuck at the "conversation too
|
|
283
|
+
// long" prompt and a fresh start is the only remaining recovery.
|
|
254
284
|
if ((await this.killForRecovery(sessionName)) === 'deferred-still-working') {
|
|
255
285
|
return {
|
|
256
286
|
recovered: false, failureType: 'context_exhaustion', attemptNumber, deferred: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionRecovery.js","sourceRoot":"","sources":["../../src/monitoring/SessionRecovery.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SessionRecovery.js","sourceRoot":"","sources":["../../src/monitoring/SessionRecovery.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"$schema": "./builtin-manifest.schema.json",
|
|
3
3
|
"schemaVersion": 1,
|
|
4
|
-
"generatedAt": "2026-06-
|
|
5
|
-
"instarVersion": "1.3.
|
|
4
|
+
"generatedAt": "2026-06-06T21:38:40.950Z",
|
|
5
|
+
"instarVersion": "1.3.381",
|
|
6
6
|
"entryCount": 199,
|
|
7
7
|
"entries": {
|
|
8
8
|
"hook:session-start": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"domain": "identity",
|
|
12
12
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
13
13
|
"installedPath": ".instar/hooks/instar/session-start.sh",
|
|
14
|
-
"contentHash": "
|
|
14
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
15
15
|
"since": "2025-01-01"
|
|
16
16
|
},
|
|
17
17
|
"hook:dangerous-command-guard": {
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"domain": "safety",
|
|
21
21
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
22
22
|
"installedPath": ".instar/hooks/instar/dangerous-command-guard.sh",
|
|
23
|
-
"contentHash": "
|
|
23
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
24
24
|
"since": "2025-01-01"
|
|
25
25
|
},
|
|
26
26
|
"hook:grounding-before-messaging": {
|
|
@@ -29,7 +29,7 @@
|
|
|
29
29
|
"domain": "safety",
|
|
30
30
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
31
31
|
"installedPath": ".instar/hooks/instar/grounding-before-messaging.sh",
|
|
32
|
-
"contentHash": "
|
|
32
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
33
33
|
"since": "2025-01-01"
|
|
34
34
|
},
|
|
35
35
|
"hook:compaction-recovery": {
|
|
@@ -38,7 +38,7 @@
|
|
|
38
38
|
"domain": "identity",
|
|
39
39
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
40
40
|
"installedPath": ".instar/hooks/instar/compaction-recovery.sh",
|
|
41
|
-
"contentHash": "
|
|
41
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
42
42
|
"since": "2025-01-01"
|
|
43
43
|
},
|
|
44
44
|
"hook:external-operation-gate": {
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"domain": "safety",
|
|
48
48
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
49
49
|
"installedPath": ".instar/hooks/instar/external-operation-gate.js",
|
|
50
|
-
"contentHash": "
|
|
50
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
51
51
|
"since": "2025-01-01"
|
|
52
52
|
},
|
|
53
53
|
"hook:deferral-detector": {
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"domain": "safety",
|
|
57
57
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
58
58
|
"installedPath": ".instar/hooks/instar/deferral-detector.js",
|
|
59
|
-
"contentHash": "
|
|
59
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
60
60
|
"since": "2025-01-01"
|
|
61
61
|
},
|
|
62
62
|
"hook:self-stop-guard": {
|
|
@@ -65,7 +65,7 @@
|
|
|
65
65
|
"domain": "coherence",
|
|
66
66
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
67
67
|
"installedPath": ".instar/hooks/instar/self-stop-guard.js",
|
|
68
|
-
"contentHash": "
|
|
68
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
69
69
|
"since": "2025-01-01"
|
|
70
70
|
},
|
|
71
71
|
"hook:post-action-reflection": {
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"domain": "evolution",
|
|
75
75
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
76
76
|
"installedPath": ".instar/hooks/instar/post-action-reflection.js",
|
|
77
|
-
"contentHash": "
|
|
77
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
78
78
|
"since": "2025-01-01"
|
|
79
79
|
},
|
|
80
80
|
"hook:external-communication-guard": {
|
|
@@ -83,7 +83,7 @@
|
|
|
83
83
|
"domain": "safety",
|
|
84
84
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
85
85
|
"installedPath": ".instar/hooks/instar/external-communication-guard.js",
|
|
86
|
-
"contentHash": "
|
|
86
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
87
87
|
"since": "2025-01-01"
|
|
88
88
|
},
|
|
89
89
|
"hook:scope-coherence-collector": {
|
|
@@ -92,7 +92,7 @@
|
|
|
92
92
|
"domain": "coherence",
|
|
93
93
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
94
94
|
"installedPath": ".instar/hooks/instar/scope-coherence-collector.js",
|
|
95
|
-
"contentHash": "
|
|
95
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
96
96
|
"since": "2025-01-01"
|
|
97
97
|
},
|
|
98
98
|
"hook:scope-coherence-checkpoint": {
|
|
@@ -101,7 +101,7 @@
|
|
|
101
101
|
"domain": "coherence",
|
|
102
102
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
103
103
|
"installedPath": ".instar/hooks/instar/scope-coherence-checkpoint.js",
|
|
104
|
-
"contentHash": "
|
|
104
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
105
105
|
"since": "2025-01-01"
|
|
106
106
|
},
|
|
107
107
|
"hook:free-text-guard": {
|
|
@@ -110,7 +110,7 @@
|
|
|
110
110
|
"domain": "safety",
|
|
111
111
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
112
112
|
"installedPath": ".instar/hooks/instar/free-text-guard.sh",
|
|
113
|
-
"contentHash": "
|
|
113
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
114
114
|
"since": "2025-01-01"
|
|
115
115
|
},
|
|
116
116
|
"hook:claim-intercept": {
|
|
@@ -119,7 +119,7 @@
|
|
|
119
119
|
"domain": "coherence",
|
|
120
120
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
121
121
|
"installedPath": ".instar/hooks/instar/claim-intercept.js",
|
|
122
|
-
"contentHash": "
|
|
122
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
123
123
|
"since": "2025-01-01"
|
|
124
124
|
},
|
|
125
125
|
"hook:claim-intercept-response": {
|
|
@@ -128,7 +128,7 @@
|
|
|
128
128
|
"domain": "coherence",
|
|
129
129
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
130
130
|
"installedPath": ".instar/hooks/instar/claim-intercept-response.js",
|
|
131
|
-
"contentHash": "
|
|
131
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
132
132
|
"since": "2025-01-01"
|
|
133
133
|
},
|
|
134
134
|
"hook:stop-gate-router": {
|
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
"domain": "safety",
|
|
138
138
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
139
139
|
"installedPath": ".instar/hooks/instar/stop-gate-router.js",
|
|
140
|
-
"contentHash": "
|
|
140
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
141
141
|
"since": "2025-01-01"
|
|
142
142
|
},
|
|
143
143
|
"hook:auto-approve-permissions": {
|
|
@@ -146,7 +146,7 @@
|
|
|
146
146
|
"domain": "safety",
|
|
147
147
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
148
148
|
"installedPath": ".instar/hooks/instar/auto-approve-permissions.js",
|
|
149
|
-
"contentHash": "
|
|
149
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
150
150
|
"since": "2025-01-01"
|
|
151
151
|
},
|
|
152
152
|
"job:health-check": {
|
|
@@ -1514,7 +1514,7 @@
|
|
|
1514
1514
|
"type": "subsystem",
|
|
1515
1515
|
"domain": "sessions",
|
|
1516
1516
|
"sourcePath": "src/core/SessionManager.ts",
|
|
1517
|
-
"contentHash": "
|
|
1517
|
+
"contentHash": "dd7e1ac290c0cfdf8e60334519448659de20ff449c9dbb3d56f616c32c1b2763",
|
|
1518
1518
|
"since": "2025-01-01"
|
|
1519
1519
|
},
|
|
1520
1520
|
"subsystem:auto-updater": {
|
|
@@ -1538,7 +1538,7 @@
|
|
|
1538
1538
|
"type": "subsystem",
|
|
1539
1539
|
"domain": "updates",
|
|
1540
1540
|
"sourcePath": "src/core/PostUpdateMigrator.ts",
|
|
1541
|
-
"contentHash": "
|
|
1541
|
+
"contentHash": "f1aacd1fdb49755abf108a032bf8dae70e0ae14240ab1f21e50e79c4433748be",
|
|
1542
1542
|
"since": "2025-01-01"
|
|
1543
1543
|
},
|
|
1544
1544
|
"subsystem:scheduler": {
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
# Upgrade Guide — vNEXT
|
|
2
|
+
|
|
3
|
+
<!-- assembled-by: assemble-next-md -->
|
|
4
|
+
<!-- bump: patch -->
|
|
5
|
+
|
|
6
|
+
## What Changed
|
|
7
|
+
|
|
8
|
+
Spawned sessions now receive the agent's OWN GitHub token from its encrypted
|
|
9
|
+
per-agent vault (Phase-3 increment P3b, option C — per-agent credential
|
|
10
|
+
isolation). At spawn, `SessionManager` resolves `github_token` (or
|
|
11
|
+
`github.token`) from the SecretStore and injects `GH_TOKEN` into the session
|
|
12
|
+
environment, which the GitHub CLI prefers over the machine-global
|
|
13
|
+
`~/.config/gh` seat. With no vault token the spawn is unchanged byte-for-byte;
|
|
14
|
+
a vault read problem is fail-soft (one warning, spawn proceeds). The hardened
|
|
15
|
+
triage spawn is deliberately excluded — it scrubs credentials by design.
|
|
16
|
+
|
|
17
|
+
## What to Tell Your User
|
|
18
|
+
|
|
19
|
+
Nothing user-facing changes. Foundation work (experimental) for credential
|
|
20
|
+
isolation on shared machines: when an agent has its own GitHub token stored in
|
|
21
|
+
its encrypted vault, work sessions automatically use that token instead of the
|
|
22
|
+
computer-wide GitHub login, so agents on a shared machine stop borrowing each
|
|
23
|
+
other's GitHub identity. Agents without a stored token keep working exactly as
|
|
24
|
+
before.
|
|
25
|
+
|
|
26
|
+
## Summary of New Capabilities
|
|
27
|
+
|
|
28
|
+
- Vault-backed GH_TOKEN injection at all three real spawn sites (headless,
|
|
29
|
+
rerouted-interactive, warm interactive); triage spawn excluded by design.
|
|
30
|
+
- `resolveGhTokenFromVault(stateDir)` in `src/core/ghToken.ts` — pure-fs,
|
|
31
|
+
never-throws vault resolution (canonical key `github_token`, nested
|
|
32
|
+
`github.token` variant).
|
|
33
|
+
- Deflake: the headless-spawn-reroute suite no longer depends on the dev
|
|
34
|
+
machine's live memory pressure.
|
|
35
|
+
|
|
36
|
+
## Evidence
|
|
37
|
+
|
|
38
|
+
Verified by 10 unit tests on the resolver (`gh-token-vault`: both key paths,
|
|
39
|
+
precedence, trimming, absent vault, non-string, whitespace, corrupt vault
|
|
40
|
+
never throws, production dual-key read) and 5 spawn tests
|
|
41
|
+
(`session-spawn-gh-token`: real vault to real tmux argv — token present with
|
|
42
|
+
INSTAR canaries intact, no-vault byte-for-byte unchanged, corrupt vault
|
|
43
|
+
fail-soft, whitespace treated as absent, rerouted lane covered). Canary
|
|
44
|
+
suites green: headless-spawn-reroute, session-manager behavioral, terminate,
|
|
45
|
+
injection, SecretStore, GitSync, no-silent-fallbacks — 119 of 119. Clean
|
|
46
|
+
type-check; docs-coverage floors hold.
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
# Upgrade Guide — vNEXT
|
|
2
|
+
|
|
3
|
+
<!-- assembled-by: assemble-next-md -->
|
|
4
|
+
<!-- bump: patch -->
|
|
5
|
+
|
|
6
|
+
## What Changed
|
|
7
|
+
|
|
8
|
+
Context-wall recovery escalation — when a session is genuinely stuck at the
|
|
9
|
+
context wall ("Context limit reached · /compact or /clear to continue" /
|
|
10
|
+
"conversation too long"), recovery now presses `/compact` for it FIRST,
|
|
11
|
+
preserving the conversation, before falling back to the destructive fresh
|
|
12
|
+
respawn.
|
|
13
|
+
|
|
14
|
+
Grounded diagnosis of "still sometimes having trouble recovering from
|
|
15
|
+
compaction": the deployed code already suppresses false-death floods (a 100%
|
|
16
|
+
session still producing work is deferred, not falsely killed) and #935 fixed
|
|
17
|
+
recovery verification across UUID rotation. But the logs showed ZERO real
|
|
18
|
+
context-exhaustion recoveries ever fired, and the one recovery action that
|
|
19
|
+
exists is destructive — kill + respawn FRESH, losing the conversation.
|
|
20
|
+
**Nothing ever pressed `/compact`** — the exact button the wall asks for, and
|
|
21
|
+
the one that preserves the conversation.
|
|
22
|
+
|
|
23
|
+
`SessionRecovery.recoverFromContextExhaustion` now has a two-rung ladder:
|
|
24
|
+
rung 1 presses `/compact` (gated to a genuinely idle session — a working
|
|
25
|
+
session at 100% is left alone) and verifies the wall cleared; rung 2 (the
|
|
26
|
+
pre-existing kill + fresh respawn) is reached only if `/compact` is
|
|
27
|
+
unavailable, declined, or can't clear the wall. The new `attemptCompaction`
|
|
28
|
+
dep is optional — absent ⇒ unchanged behavior.
|
|
29
|
+
|
|
30
|
+
## What to Tell Your User
|
|
31
|
+
|
|
32
|
+
When a long session of mine hits the memory wall, I now try to compact it in
|
|
33
|
+
place first — squashing the conversation smaller so it can keep going WITHOUT
|
|
34
|
+
losing what we were doing. A from-scratch restart only happens if compaction
|
|
35
|
+
genuinely can't help. So "trouble recovering from compaction" should now far
|
|
36
|
+
more often end in "compacted and kept going" rather than "restarted fresh."
|
|
37
|
+
|
|
38
|
+
## Summary of New Capabilities
|
|
39
|
+
|
|
40
|
+
- `SessionRecovery.attemptCompaction` rung — non-destructive `/compact`
|
|
41
|
+
escalation before the fresh respawn, gated to genuinely-idle stuck sessions,
|
|
42
|
+
verified via `detectContextExhaustion`. Conversation preserved on success.
|
|
43
|
+
- server.ts wires it to `injectMessage('/compact')` + a bounded verify poll.
|
|
44
|
+
- CLAUDE.md "Context-wall recovery escalation" note so an agent can answer
|
|
45
|
+
"did I lose the conversation when my session restarted?"
|
|
46
|
+
|
|
47
|
+
## Evidence
|
|
48
|
+
|
|
49
|
+
Grounded in the 2026-06-06 logs (zero real recoveries; all detections
|
|
50
|
+
deferred) + the user's screenshot ("Context limit reached", "100% context
|
|
51
|
+
used"). 8 new unit tests both sides of every boundary (compact-clears →
|
|
52
|
+
preserved + no kill/respawn; compact-fails → fresh respawn; working session →
|
|
53
|
+
deferred not compacted; no-dep back-compat; throw → non-fatal) + a server.ts
|
|
54
|
+
wiring dead-code guard + migrator add/patch/idempotent. tsc clean; preflight
|
|
55
|
+
PASS; recovery neighbor suites green.
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
# ELI16 — Context-Wall Recovery Escalation
|
|
2
|
+
|
|
3
|
+
## The problem
|
|
4
|
+
|
|
5
|
+
You flagged that I'm "still sometimes having trouble recovering from
|
|
6
|
+
compaction." I dug into the actual code and logs (not guessing), and here's
|
|
7
|
+
what's really going on.
|
|
8
|
+
|
|
9
|
+
When one of my sessions fills up its memory, Claude Code puts up a wall:
|
|
10
|
+
"Context limit reached · /compact or /clear to continue." It's literally asking
|
|
11
|
+
someone to press `/compact` (squash the conversation smaller) or `/clear` (wipe
|
|
12
|
+
it). The catch I found: **nobody was ever pressing that button for me.** My
|
|
13
|
+
recovery system had exactly one move for this situation — kill the session and
|
|
14
|
+
start a brand-new one. That works, but it throws away the whole conversation.
|
|
15
|
+
And in the logs, it had basically never even fired, because it correctly avoids
|
|
16
|
+
touching a session that's still busy working.
|
|
17
|
+
|
|
18
|
+
So a session could sit stuck at that wall: too busy-looking to safely restart,
|
|
19
|
+
but with nothing pressing the button to get it past the wall.
|
|
20
|
+
|
|
21
|
+
## What this fixes
|
|
22
|
+
|
|
23
|
+
I added the missing move. Now, before doing anything drastic, recovery tries
|
|
24
|
+
the gentle thing first: it presses `/compact` for the stuck session and checks
|
|
25
|
+
that the wall actually cleared. If it works, the conversation is preserved —
|
|
26
|
+
you don't lose anything, the session just gets lighter and keeps going. Only if
|
|
27
|
+
`/compact` genuinely can't help (the conversation is too big to even compact)
|
|
28
|
+
does it fall back to the old "start fresh" behavior.
|
|
29
|
+
|
|
30
|
+
## Why it's safe
|
|
31
|
+
|
|
32
|
+
- **It won't interrupt working sessions.** The `/compact` press only happens for
|
|
33
|
+
a session that's genuinely idle and stuck at the wall — never one that's still
|
|
34
|
+
actively doing work at 100%.
|
|
35
|
+
- **It's strictly gentler than before.** The old behavior (kill + restart) is
|
|
36
|
+
now the LAST resort, not the first and only one.
|
|
37
|
+
- **If anything goes wrong pressing the button, nothing breaks** — it just falls
|
|
38
|
+
through to the old path, so it's never worse than today.
|
|
39
|
+
|
|
40
|
+
Tested both ways: /compact clears the wall → conversation kept, no restart; and
|
|
41
|
+
/compact can't help → falls back to a fresh restart. Plus checks that a busy
|
|
42
|
+
session is left completely alone.
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
# ELI16 — The agent brings its own GitHub key
|
|
2
|
+
|
|
3
|
+
## The one-sentence version
|
|
4
|
+
When an agent starts a work session, it now slips its OWN GitHub key (from its
|
|
5
|
+
locked per-agent safe) into that session's pocket — instead of every agent on
|
|
6
|
+
the computer reaching for the one shared key hanging by the door.
|
|
7
|
+
|
|
8
|
+
## The backstory
|
|
9
|
+
This is the third installment of the "shared computer" security fix. A real
|
|
10
|
+
incident showed what goes wrong when several agents (working for different
|
|
11
|
+
people) share one machine: one agent ended up using a DIFFERENT person's
|
|
12
|
+
GitHub seat, because the GitHub command-line tool reads one machine-wide
|
|
13
|
+
login file (`~/.config/gh`) no matter who is asking. Earlier installments
|
|
14
|
+
locked down git *identity* (whose name goes on commits). This one starts on
|
|
15
|
+
git *credentials* (whose key opens the door).
|
|
16
|
+
|
|
17
|
+
The design the operator picked (option C): don't force everyone to re-log-in
|
|
18
|
+
with separate config folders — instead use the per-agent encrypted safe
|
|
19
|
+
(the SecretStore vault) that already exists, already holds secrets like
|
|
20
|
+
`github_token` for some agents, and already syncs between an agent's own
|
|
21
|
+
machines.
|
|
22
|
+
|
|
23
|
+
## What this change does
|
|
24
|
+
At the moment a session is spawned, the agent's vault is checked for a GitHub
|
|
25
|
+
token (`github_token`, or the nested `github.token`). If one is there, the
|
|
26
|
+
session's environment gets `GH_TOKEN=<that token>` — and the GitHub CLI
|
|
27
|
+
prefers `GH_TOKEN` over the machine-wide login file, so everything the
|
|
28
|
+
session does on GitHub happens as THIS agent. If the vault has no token,
|
|
29
|
+
nothing is added and the session behaves exactly as before.
|
|
30
|
+
|
|
31
|
+
Three careful details:
|
|
32
|
+
|
|
33
|
+
1. **No token, no change.** Installs that never set up a vault token keep
|
|
34
|
+
today's behavior byte-for-byte. We prove this with a test that spawns
|
|
35
|
+
without a vault and checks the environment has no GH_TOKEN at all.
|
|
36
|
+
2. **A broken safe can't break work.** If the vault can't be read (corrupted,
|
|
37
|
+
wrong key, whatever), the spawn logs one warning and proceeds without the
|
|
38
|
+
token. A test corrupts the vault on purpose and proves the session still
|
|
39
|
+
starts.
|
|
40
|
+
3. **The hardened triage session is deliberately skipped.** That special spawn
|
|
41
|
+
scrubs credentials from its environment by design — we don't hand it a
|
|
42
|
+
GitHub key.
|
|
43
|
+
|
|
44
|
+
## Why it's safe
|
|
45
|
+
- The injection rides the exact same mechanism the system already uses to
|
|
46
|
+
hand sessions their other credentials (the Anthropic key travels the same
|
|
47
|
+
way) — no new transport invented.
|
|
48
|
+
- The resolver never throws and never runs a subprocess, so it can't wedge a
|
|
49
|
+
spawn or trip the test suites that script subprocess call sequences.
|
|
50
|
+
- Reading the vault uses the dual-key fallback shipped earlier, so a vault
|
|
51
|
+
written with a file key still opens even when the keychain is unavailable.
|
|
52
|
+
|
|
53
|
+
## A bonus fix that rode along
|
|
54
|
+
The existing spawn-reroute test suite secretly depended on the DEVELOPER'S
|
|
55
|
+
machine having free memory (the reroute gate genuinely refuses when the real
|
|
56
|
+
host is loaded). On a busy machine, 8 tests failed before this change touched
|
|
57
|
+
anything. The suite now pins the pressure reading to "normal," because those
|
|
58
|
+
tests assert reroute logic, not host health.
|
|
59
|
+
|
|
60
|
+
## What's deliberately left for next time
|
|
61
|
+
- **P3c**: the git credential helper side (plain `git push` over https still
|
|
62
|
+
uses the machine keychain — `gh` operations are covered now, raw git isn't).
|
|
63
|
+
- Server-side `gh` calls (CI polling, repo lookups) still use the machine
|
|
64
|
+
seat; they can adopt the same resolver later.
|
|
65
|
+
- An agent-awareness section once Phase 3 is complete, so agents know a vault
|
|
66
|
+
`github_token` flows to their sessions automatically.
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
# Side-Effects Review — Context-Wall Recovery Escalation
|
|
2
|
+
|
|
3
|
+
**Version / slug:** `context-wall-compact-escalation`
|
|
4
|
+
**Date:** `2026-06-06`
|
|
5
|
+
**Author:** `Echo (instar-dev agent — Justin: "still sometimes having trouble recovering from compaction, can you look into this?")`
|
|
6
|
+
**Second-pass reviewer:** `self-adversarial pass over the one way this can go wrong — pressing /compact on a session that shouldn't be touched`
|
|
7
|
+
|
|
8
|
+
## Summary of the change
|
|
9
|
+
|
|
10
|
+
`SessionRecovery.recoverFromContextExhaustion` gains a non-destructive rung
|
|
11
|
+
BEFORE its existing kill+fresh-respawn: an optional `attemptCompaction(name)`
|
|
12
|
+
dep presses `/compact` for a session genuinely stuck at the context wall and
|
|
13
|
+
verifies the wall cleared (`detectContextExhaustion`). On success the
|
|
14
|
+
conversation is preserved; on failure/timeout it falls through to the
|
|
15
|
+
pre-existing destructive respawn. Gated to `!hasActiveProcesses`. server.ts
|
|
16
|
+
wires the dep (injectMessage('/compact') + bounded verify poll). CLAUDE.md note
|
|
17
|
+
added. Files: SessionRecovery.ts, server.ts, PostUpdateMigrator.ts, 2 test files.
|
|
18
|
+
|
|
19
|
+
## Decision-point inventory
|
|
20
|
+
|
|
21
|
+
- `attemptCompaction` rung — **add (recovery action, non-destructive)** — tried
|
|
22
|
+
before the existing destructive path.
|
|
23
|
+
- `!hasActiveProcesses` gate on the rung — **add** — never /compact a working session.
|
|
24
|
+
- fall-through on cleared:false / throw — **preserve** — existing respawn unchanged.
|
|
25
|
+
- optional dep — **add** — absent ⇒ fully back-compat.
|
|
26
|
+
|
|
27
|
+
## 1. Over-block
|
|
28
|
+
|
|
29
|
+
None. The rung adds no blocking authority; it is strictly LESS destructive than
|
|
30
|
+
the kill+respawn it precedes. The only "action" is a `/compact` keystroke, gated
|
|
31
|
+
to a genuinely idle stuck session. A working session is never compacted (the
|
|
32
|
+
gate + the existing kill-defer both protect it).
|
|
33
|
+
|
|
34
|
+
## 2. Under-block (the real risk — pressing /compact wrongly)
|
|
35
|
+
|
|
36
|
+
The danger is compacting a session that's actually fine. Defenses, each tested:
|
|
37
|
+
- **`!hasActiveProcesses` gate:** a session with running children (working) skips
|
|
38
|
+
the rung entirely (test: "does NOT /compact a working session").
|
|
39
|
+
- **Reached only on a confirmed context-exhaustion detection** (the caller already
|
|
40
|
+
matched `detectContextExhaustion` on the live output before calling recovery).
|
|
41
|
+
- **Verify-then-claim:** the rung only reports success when the wall signature is
|
|
42
|
+
actually gone from the live tail post-/compact; a no-op /compact times out and
|
|
43
|
+
falls through.
|
|
44
|
+
Residual: if a session shows the wall signature but is between turns with a
|
|
45
|
+
child momentarily absent, the rung could /compact it — but /compact on a session
|
|
46
|
+
that didn't need it is benign (Claude compacts and continues), and the detection
|
|
47
|
+
gate makes this rare. Worst case is strictly better than the old "kill it."
|
|
48
|
+
|
|
49
|
+
## 3. Level-of-abstraction fit
|
|
50
|
+
|
|
51
|
+
The rung lives in the dedicated context-exhaustion handler. The inject+verify
|
|
52
|
+
mechanism is wired in server.ts (which owns SessionManager) via existing
|
|
53
|
+
primitives (`injectMessage`, `captureOutput`, `detectContextExhaustion`) — no
|
|
54
|
+
new transport. The dep is injected, mirroring `respawnSessionFresh`.
|
|
55
|
+
|
|
56
|
+
## 4. Signal vs authority compliance
|
|
57
|
+
|
|
58
|
+
**Required reference:** `docs/signal-vs-authority.md`
|
|
59
|
+
|
|
60
|
+
- [x] The escalation is a bounded recovery ACTION, gated by the same work-check
|
|
61
|
+
and attempt/cooldown limits as the existing kill+respawn, and strictly less
|
|
62
|
+
destructive. No new decision-maker; verification (not assertion) gates the
|
|
63
|
+
success claim. Failure degrades to the prior authority path.
|
|
64
|
+
|
|
65
|
+
## 5. Interactions
|
|
66
|
+
|
|
67
|
+
- **SessionMonitor:** unchanged caller — it already calls `checkAndRecover` on a
|
|
68
|
+
confirmed context-exhaustion detection; the new rung is internal to recovery.
|
|
69
|
+
- **kill-defer / hasActiveProcesses:** the rung reuses the same work-check the
|
|
70
|
+
kill uses, so a working session is uniformly protected across both rungs.
|
|
71
|
+
- **attempt/cooldown limits (`shouldAttempt`):** unchanged — a /compact attempt
|
|
72
|
+
counts as the attempt, same as a respawn did.
|
|
73
|
+
- **#935 (UUID-rotation verification):** orthogonal — that fix is for the
|
|
74
|
+
sentinel's JSONL-growth verification; this rung verifies via tmux tail.
|
|
75
|
+
|
|
76
|
+
## 6. External surfaces / 7. Rollback
|
|
77
|
+
|
|
78
|
+
No API, no route, no config key (the dep is wired in server.ts; default-on when
|
|
79
|
+
wired). One idempotent CLAUDE.md note (marker 'Context-wall recovery
|
|
80
|
+
escalation'). Rollback = revert; recovery returns to kill+fresh-respawn-only
|
|
81
|
+
(the conversation-losing behavior).
|