@codeyam/codeyam-cli 0.1.0-staging.25a2014 → 0.1.0-staging.26dc674
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/analyzer-template/.build-info.json +7 -7
- package/analyzer-template/log.txt +3 -3
- package/analyzer-template/package.json +2 -2
- package/analyzer-template/packages/ai/src/lib/dataStructure/ScopeDataStructure.ts +5 -1
- package/analyzer-template/packages/analyze/src/lib/files/analyze/findOrCreateEntity.ts +10 -6
- package/analyzer-template/packages/analyze/src/lib/files/analyze/gatherEntityMap.ts +9 -12
- package/analyzer-template/packages/analyze/src/lib/files/analyzeChange.ts +4 -0
- package/analyzer-template/packages/analyze/src/lib/files/analyzeInitial.ts +4 -0
- package/analyzer-template/packages/aws/package.json +1 -1
- package/analyzer-template/packages/database/package.json +1 -1
- package/analyzer-template/packages/database/src/lib/loadAnalysis.ts +19 -15
- package/analyzer-template/packages/database/src/lib/loadEntity.ts +19 -8
- package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.js +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadAnalysis.js.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.d.ts +4 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.d.ts.map +1 -1
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.js +5 -5
- package/analyzer-template/packages/github/dist/database/src/lib/loadEntity.js.map +1 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.d.ts +3 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.d.ts.map +1 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js +22 -1
- package/analyzer-template/packages/utils/dist/utils/src/lib/fs/rsyncCopy.js.map +1 -1
- package/analyzer-template/packages/utils/src/lib/fs/rsyncCopy.ts +27 -0
- package/analyzer-template/project/analyzeFileEntities.ts +26 -0
- package/background/src/lib/virtualized/project/analyzeFileEntities.js +22 -0
- package/background/src/lib/virtualized/project/analyzeFileEntities.js.map +1 -1
- package/codeyam-cli/src/cli.js +15 -0
- package/codeyam-cli/src/cli.js.map +1 -1
- package/codeyam-cli/src/commands/__tests__/editor.stepDispatch.test.js +9 -9
- package/codeyam-cli/src/commands/editor.js +981 -344
- package/codeyam-cli/src/commands/editor.js.map +1 -1
- package/codeyam-cli/src/commands/init.js +1 -0
- package/codeyam-cli/src/commands/init.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorAudit.test.js +1274 -33
- package/codeyam-cli/src/utils/__tests__/editorAudit.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorCaptureScenarioSeeding.test.js +137 -0
- package/codeyam-cli/src/utils/__tests__/editorCaptureScenarioSeeding.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/editorEntityHelpers.test.js +66 -0
- package/codeyam-cli/src/utils/__tests__/editorEntityHelpers.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorGuardMiddleware.test.js +67 -0
- package/codeyam-cli/src/utils/__tests__/editorGuardMiddleware.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/editorScenarioSwitch.test.js +70 -0
- package/codeyam-cli/src/utils/__tests__/editorScenarioSwitch.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/editorScenarios.test.js +71 -1
- package/codeyam-cli/src/utils/__tests__/editorScenarios.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/entityChangeStatus.test.js +233 -1
- package/codeyam-cli/src/utils/__tests__/entityChangeStatus.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/glossaryAdd.test.js +177 -0
- package/codeyam-cli/src/utils/__tests__/glossaryAdd.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/journalCaptureStabilization.test.js +16 -1
- package/codeyam-cli/src/utils/__tests__/journalCaptureStabilization.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/registerScenarioResult.test.js +127 -0
- package/codeyam-cli/src/utils/__tests__/registerScenarioResult.test.js.map +1 -0
- package/codeyam-cli/src/utils/__tests__/scenarioCoverage.test.js +57 -0
- package/codeyam-cli/src/utils/__tests__/scenarioCoverage.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/scenariosManifest.test.js +41 -0
- package/codeyam-cli/src/utils/__tests__/scenariosManifest.test.js.map +1 -1
- package/codeyam-cli/src/utils/__tests__/screenshotHash.test.js +84 -0
- package/codeyam-cli/src/utils/__tests__/screenshotHash.test.js.map +1 -0
- package/codeyam-cli/src/utils/analysisRunner.js +8 -6
- package/codeyam-cli/src/utils/analysisRunner.js.map +1 -1
- package/codeyam-cli/src/utils/analyzer.js +8 -0
- package/codeyam-cli/src/utils/analyzer.js.map +1 -1
- package/codeyam-cli/src/utils/editorAudit.js +277 -37
- package/codeyam-cli/src/utils/editorAudit.js.map +1 -1
- package/codeyam-cli/src/utils/editorGuard.js +36 -0
- package/codeyam-cli/src/utils/editorGuard.js.map +1 -0
- package/codeyam-cli/src/utils/editorRecapture.js +109 -0
- package/codeyam-cli/src/utils/editorRecapture.js.map +1 -0
- package/codeyam-cli/src/utils/editorScenarioSwitch.js +24 -2
- package/codeyam-cli/src/utils/editorScenarioSwitch.js.map +1 -1
- package/codeyam-cli/src/utils/editorScenarios.js +65 -6
- package/codeyam-cli/src/utils/editorScenarios.js.map +1 -1
- package/codeyam-cli/src/utils/entityChangeStatus.js +31 -3
- package/codeyam-cli/src/utils/entityChangeStatus.js.map +1 -1
- package/codeyam-cli/src/utils/glossaryAdd.js +74 -0
- package/codeyam-cli/src/utils/glossaryAdd.js.map +1 -0
- package/codeyam-cli/src/utils/install-skills.js +5 -0
- package/codeyam-cli/src/utils/install-skills.js.map +1 -1
- package/codeyam-cli/src/utils/queue/job.js +6 -3
- package/codeyam-cli/src/utils/queue/job.js.map +1 -1
- package/codeyam-cli/src/utils/registerScenarioResult.js +52 -0
- package/codeyam-cli/src/utils/registerScenarioResult.js.map +1 -0
- package/codeyam-cli/src/utils/scenarioCoverage.js +4 -1
- package/codeyam-cli/src/utils/scenarioCoverage.js.map +1 -1
- package/codeyam-cli/src/utils/scenariosManifest.js +28 -0
- package/codeyam-cli/src/utils/scenariosManifest.js.map +1 -1
- package/codeyam-cli/src/utils/screenshotHash.js +26 -0
- package/codeyam-cli/src/utils/screenshotHash.js.map +1 -0
- package/codeyam-cli/src/utils/simulationGateMiddleware.js +9 -0
- package/codeyam-cli/src/utils/simulationGateMiddleware.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js +68 -1
- package/codeyam-cli/src/webserver/__tests__/clientErrors.test.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/idleDetector.test.js +123 -21
- package/codeyam-cli/src/webserver/__tests__/idleDetector.test.js.map +1 -1
- package/codeyam-cli/src/webserver/__tests__/stripClaudeCommand.test.js +135 -0
- package/codeyam-cli/src/webserver/__tests__/stripClaudeCommand.test.js.map +1 -0
- package/codeyam-cli/src/webserver/app/lib/clientErrors.js +22 -1
- package/codeyam-cli/src/webserver/app/lib/clientErrors.js.map +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-recapture-stale-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-save-scenario-data-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/api.editor-schema-l0sNRNKZ.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/{cy-logo-cli-CCKUIm0S.svg → cy-logo-cli-CJzc4vOH.svg} +2 -2
- package/codeyam-cli/src/webserver/build/client/assets/cy-logo-cli-DODLxLcw.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/editor.entity.(_sha)-Dx-h1rJK.js +130 -0
- package/codeyam-cli/src/webserver/build/client/assets/editorPreview-NTuLi4Xg.js +41 -0
- package/codeyam-cli/src/webserver/build/client/assets/{entity._sha.scenarios._scenarioId.dev-CUobbQdQ.js → entity._sha.scenarios._scenarioId.dev-BA5L8bU-.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/{entity._sha.scenarios._scenarioId.fullscreen-C6eeL24i.js → entity._sha.scenarios._scenarioId.fullscreen-D4dmRgvO.js} +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/globals-BrPXT1iR.css +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/manifest-5025e428.js +1 -0
- package/codeyam-cli/src/webserver/build/client/assets/{root-DB3O9_9j.js → root-BCx1S8Z3.js} +26 -13
- package/codeyam-cli/src/webserver/build/server/assets/analysisRunner-C1kjC9UJ.js +13 -0
- package/codeyam-cli/src/webserver/build/server/assets/{index-CEaDhUiv.js → index-C91yWWCI.js} +1 -1
- package/codeyam-cli/src/webserver/build/server/assets/{init-DA7guOrE.js → init-Dkas-RUS.js} +2 -2
- package/codeyam-cli/src/webserver/build/server/assets/server-build-pulXLTrG.js +640 -0
- package/codeyam-cli/src/webserver/build/server/index.js +1 -1
- package/codeyam-cli/src/webserver/build-info.json +5 -5
- package/codeyam-cli/src/webserver/idleDetector.js +41 -8
- package/codeyam-cli/src/webserver/idleDetector.js.map +1 -1
- package/codeyam-cli/src/webserver/scripts/journalCapture.ts +53 -0
- package/codeyam-cli/src/webserver/server.js +52 -14
- package/codeyam-cli/src/webserver/server.js.map +1 -1
- package/codeyam-cli/src/webserver/terminalServer.js +141 -27
- package/codeyam-cli/src/webserver/terminalServer.js.map +1 -1
- package/codeyam-cli/templates/__tests__/editor-step-hook.prompt-capture.test.ts +118 -0
- package/codeyam-cli/templates/codeyam-editor-claude.md +2 -0
- package/codeyam-cli/templates/codeyam-editor-reference.md +214 -0
- package/codeyam-cli/templates/editor-step-hook.py +93 -46
- package/codeyam-cli/templates/skills/codeyam-editor/SKILL.md +19 -1
- package/package.json +1 -1
- package/packages/ai/src/lib/dataStructure/ScopeDataStructure.js +4 -1
- package/packages/ai/src/lib/dataStructure/ScopeDataStructure.js.map +1 -1
- package/packages/analyze/src/lib/files/analyze/findOrCreateEntity.js +3 -2
- package/packages/analyze/src/lib/files/analyze/findOrCreateEntity.js.map +1 -1
- package/packages/analyze/src/lib/files/analyze/gatherEntityMap.js +9 -7
- package/packages/analyze/src/lib/files/analyze/gatherEntityMap.js.map +1 -1
- package/packages/analyze/src/lib/files/analyzeChange.js +1 -0
- package/packages/analyze/src/lib/files/analyzeChange.js.map +1 -1
- package/packages/analyze/src/lib/files/analyzeInitial.js +1 -0
- package/packages/analyze/src/lib/files/analyzeInitial.js.map +1 -1
- package/packages/database/src/lib/loadAnalysis.js +1 -1
- package/packages/database/src/lib/loadAnalysis.js.map +1 -1
- package/packages/database/src/lib/loadEntity.js +5 -5
- package/packages/database/src/lib/loadEntity.js.map +1 -1
- package/packages/utils/src/lib/fs/rsyncCopy.js +22 -1
- package/packages/utils/src/lib/fs/rsyncCopy.js.map +1 -1
- package/codeyam-cli/src/webserver/build/client/assets/cy-logo-cli-DcX-ZS3p.js +0 -1
- package/codeyam-cli/src/webserver/build/client/assets/editor.entity.(_sha)-B7xQ9Sjy.js +0 -58
- package/codeyam-cli/src/webserver/build/client/assets/editorPreview-CxmrE6AF.js +0 -41
- package/codeyam-cli/src/webserver/build/client/assets/globals-fAqOD9ex.css +0 -1
- package/codeyam-cli/src/webserver/build/client/assets/manifest-5d53342d.js +0 -1
- package/codeyam-cli/src/webserver/build/server/assets/analysisRunner-DcJSnBCE.js +0 -13
- package/codeyam-cli/src/webserver/build/server/assets/server-build-juyiY2m6.js +0 -551
|
@@ -1 +1 @@
|
|
|
1
|
-
import{aG as Z,aH as _,aw as $,ax as rr,aE as tr,ay as or,aA as ir,aB as pr,aD as mr,aC as ar,aF as sr,az as er}from"./assets/server-build-
|
|
1
|
+
import{aG as Z,aH as _,aw as $,ax as rr,aE as tr,ay as or,aA as ir,aB as pr,aD as mr,aC as ar,aF as sr,az as er}from"./assets/server-build-pulXLTrG.js";import"react/jsx-runtime";import"node:stream";import"@react-router/node";import"react-router";import"isbot";import"react-dom/server";import"react";import"lucide-react";import"fetch-retry";import"better-sqlite3";import"pg";import"fs";import"path";import"kysely";import"kysely/helpers/sqlite";import"kysely/helpers/postgres";import"typescript";import"fs/promises";import"os";import"prompts";import"chalk";import"crypto";import"child_process";import"url";import"util";import"dotenv";import"events";import"uuid";import"http";import"net";import"ws";import"node-pty";import"openai";import"p-queue";import"p-retry";import"@aws-sdk/client-dynamodb";import"lru-cache";import"pluralize";import"piscina";import"json5";import"@aws-sdk/util-dynamodb";import"v8";import"react-syntax-highlighter";import"react-syntax-highlighter/dist/cjs/styles/prism/index.js";import"node:crypto";import"minimatch";import"react-markdown";import"remark-gfm";import"react-diff-viewer-continued";export{Z as allowedActionOrigins,_ as assets,$ as assetsBuildDirectory,rr as basename,tr as entry,or as future,ir as isSpaMode,pr as prerender,mr as publicPath,ar as routeDiscovery,sr as routes,er as ssr};
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
|
-
"buildTimestamp": "2026-03-
|
|
3
|
-
"buildTime":
|
|
4
|
-
"buildNumber":
|
|
5
|
-
"semanticVersion": "0.1.
|
|
6
|
-
"version": "0.1.
|
|
2
|
+
"buildTimestamp": "2026-03-23T18:15:13.303Z",
|
|
3
|
+
"buildTime": 1774289713303,
|
|
4
|
+
"buildNumber": 1216,
|
|
5
|
+
"semanticVersion": "0.1.1216",
|
|
6
|
+
"version": "0.1.1216 (2026-03-23T18:15)"
|
|
7
7
|
}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
*
|
|
6
6
|
* Extracted from terminalServer.ts for testability.
|
|
7
7
|
*/
|
|
8
|
+
const MAX_LAST_LINE_LENGTH = 500;
|
|
8
9
|
export class IdleDetector {
|
|
9
10
|
constructor(callbacks, options) {
|
|
10
11
|
this.idleTimer = null;
|
|
@@ -12,10 +13,12 @@ export class IdleDetector {
|
|
|
12
13
|
this.idleSignaled = false;
|
|
13
14
|
this.userIsTyping = false;
|
|
14
15
|
this.outputBytesSinceIdle = 0;
|
|
16
|
+
this.lastLine = '';
|
|
15
17
|
this.callbacks = callbacks;
|
|
16
18
|
this.idleTimeoutMs = options?.idleTimeoutMs ?? 3000;
|
|
17
19
|
this.typingCooldownMs = options?.typingCooldownMs ?? 2000;
|
|
18
20
|
this.minOutputForReidle = options?.minOutputForReidle ?? 100;
|
|
21
|
+
this.activeOutputPattern = options?.activeOutputPattern ?? null;
|
|
19
22
|
}
|
|
20
23
|
/** Call when the user sends input (keystrokes) to the PTY. */
|
|
21
24
|
onUserInput() {
|
|
@@ -31,7 +34,10 @@ export class IdleDetector {
|
|
|
31
34
|
}, this.typingCooldownMs);
|
|
32
35
|
}
|
|
33
36
|
/** Call when PTY produces output. */
|
|
34
|
-
onPtyOutput(
|
|
37
|
+
onPtyOutput(data) {
|
|
38
|
+
const byteCount = data.length;
|
|
39
|
+
// Update lastLine: content after the last \r or \n
|
|
40
|
+
this.updateLastLine(data);
|
|
35
41
|
if (this.idleTimer)
|
|
36
42
|
clearTimeout(this.idleTimer);
|
|
37
43
|
if (this.userIsTyping)
|
|
@@ -48,13 +54,7 @@ export class IdleDetector {
|
|
|
48
54
|
this.outputBytesSinceIdle = 0;
|
|
49
55
|
this.callbacks.onActive();
|
|
50
56
|
}
|
|
51
|
-
this.
|
|
52
|
-
if (!this.userIsTyping) {
|
|
53
|
-
this.idleSignaled = true;
|
|
54
|
-
this.outputBytesSinceIdle = 0;
|
|
55
|
-
this.callbacks.onIdle();
|
|
56
|
-
}
|
|
57
|
-
}, this.idleTimeoutMs);
|
|
57
|
+
this.startIdleTimer();
|
|
58
58
|
}
|
|
59
59
|
/** Whether idle has been signaled and not yet reset by new output. */
|
|
60
60
|
get isIdle() {
|
|
@@ -69,5 +69,38 @@ export class IdleDetector {
|
|
|
69
69
|
this.idleTimer = null;
|
|
70
70
|
this.typingCooldownTimer = null;
|
|
71
71
|
}
|
|
72
|
+
updateLastLine(data) {
|
|
73
|
+
// Find the last \r or \n in data. If present, discard everything
|
|
74
|
+
// before it (including the buffer) — it's been overwritten.
|
|
75
|
+
const lastCr = data.lastIndexOf('\r');
|
|
76
|
+
const lastLf = data.lastIndexOf('\n');
|
|
77
|
+
const lastBreak = Math.max(lastCr, lastLf);
|
|
78
|
+
if (lastBreak >= 0) {
|
|
79
|
+
this.lastLine = data.slice(lastBreak + 1);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
this.lastLine += data;
|
|
83
|
+
}
|
|
84
|
+
// Cap to prevent unbounded growth
|
|
85
|
+
if (this.lastLine.length > MAX_LAST_LINE_LENGTH) {
|
|
86
|
+
this.lastLine = this.lastLine.slice(-MAX_LAST_LINE_LENGTH);
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
startIdleTimer() {
|
|
90
|
+
this.idleTimer = setTimeout(() => {
|
|
91
|
+
if (this.userIsTyping)
|
|
92
|
+
return;
|
|
93
|
+
// If the active output pattern matches the last line, Claude is
|
|
94
|
+
// still working (e.g., status line with ✶). Restart the timer.
|
|
95
|
+
if (this.activeOutputPattern &&
|
|
96
|
+
this.activeOutputPattern.test(this.lastLine)) {
|
|
97
|
+
this.startIdleTimer();
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
this.idleSignaled = true;
|
|
101
|
+
this.outputBytesSinceIdle = 0;
|
|
102
|
+
this.callbacks.onIdle();
|
|
103
|
+
}, this.idleTimeoutMs);
|
|
104
|
+
}
|
|
72
105
|
}
|
|
73
106
|
//# sourceMappingURL=idleDetector.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"idleDetector.js","sourceRoot":"","sources":["../../../../src/webserver/idleDetector.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;
|
|
1
|
+
{"version":3,"file":"idleDetector.js","sourceRoot":"","sources":["../../../../src/webserver/idleDetector.ts"],"names":[],"mappings":"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"}
|
|
@@ -151,6 +151,31 @@ async function main() {
|
|
|
151
151
|
);
|
|
152
152
|
});
|
|
153
153
|
|
|
154
|
+
// Capture non-2xx API responses with their body — these reveal
|
|
155
|
+
// the actual server error (e.g. "Collection not found") rather than
|
|
156
|
+
// just a generic 404 status on the page.
|
|
157
|
+
const apiErrorPromises: Promise<void>[] = [];
|
|
158
|
+
page.on('response', (resp) => {
|
|
159
|
+
const respUrl = resp.url();
|
|
160
|
+
if (resp.status() >= 400 && respUrl.includes('/api/')) {
|
|
161
|
+
const p = resp
|
|
162
|
+
.text()
|
|
163
|
+
.then((body) => {
|
|
164
|
+
const truncated =
|
|
165
|
+
body.length > 500 ? body.slice(0, 500) + '…' : body;
|
|
166
|
+
console.log(
|
|
167
|
+
`[JournalCapture] API response error: ${resp.request().method()} ${respUrl} → ${resp.status()} — ${truncated}`,
|
|
168
|
+
);
|
|
169
|
+
})
|
|
170
|
+
.catch(() => {
|
|
171
|
+
console.log(
|
|
172
|
+
`[JournalCapture] API response error: ${resp.request().method()} ${respUrl} → ${resp.status()} — (body unavailable)`,
|
|
173
|
+
);
|
|
174
|
+
});
|
|
175
|
+
apiErrorPromises.push(p);
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
|
|
154
179
|
let lastError: Error | null = null;
|
|
155
180
|
|
|
156
181
|
for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
|
|
@@ -168,15 +193,43 @@ async function main() {
|
|
|
168
193
|
console.log(
|
|
169
194
|
`[JournalCapture] Page loaded: status=${response.status()}, url=${response.url()}`,
|
|
170
195
|
);
|
|
196
|
+
if (response.status() >= 400) {
|
|
197
|
+
console.log(
|
|
198
|
+
`[JournalCapture] HTTP error: status=${response.status()}, url=${response.url()}`,
|
|
199
|
+
);
|
|
200
|
+
}
|
|
171
201
|
}
|
|
172
202
|
|
|
173
203
|
// Wait for client-side rendering to complete (React hydration,
|
|
174
204
|
// useEffect data fetches, font loading, etc.)
|
|
175
205
|
await stabilizePage(page);
|
|
176
206
|
|
|
207
|
+
// Flush any pending API error response reads so they appear
|
|
208
|
+
// before the RESULT line in stdout
|
|
209
|
+
if (apiErrorPromises.length > 0) {
|
|
210
|
+
await Promise.all(apiErrorPromises);
|
|
211
|
+
}
|
|
212
|
+
|
|
177
213
|
const pageTitle = await page.title();
|
|
178
214
|
console.log(`[JournalCapture] Page title: ${pageTitle}`);
|
|
179
215
|
|
|
216
|
+
// Capture visible text for diagnostic output — helps debug when
|
|
217
|
+
// multiple scenarios produce identical screenshots
|
|
218
|
+
try {
|
|
219
|
+
const visibleText = await page.evaluate(`
|
|
220
|
+
(function() {
|
|
221
|
+
var el = document.getElementById('codeyam-capture') || document.body;
|
|
222
|
+
var text = el ? el.innerText : '';
|
|
223
|
+
return text.substring(0, 500).replace(/\\n+/g, ' | ').replace(/\\s+/g, ' ').trim();
|
|
224
|
+
})()
|
|
225
|
+
`);
|
|
226
|
+
console.log(
|
|
227
|
+
'[JournalCapture] Visible text: ' + (visibleText || '(empty page)'),
|
|
228
|
+
);
|
|
229
|
+
} catch (e) {
|
|
230
|
+
console.log('[JournalCapture] Visible text: (extraction failed)');
|
|
231
|
+
}
|
|
232
|
+
|
|
180
233
|
if (selector) {
|
|
181
234
|
// Element-level screenshot — captures just the wrapper element
|
|
182
235
|
const element = page.locator(selector);
|
|
@@ -206,26 +206,64 @@ app.post('/api/dev-mode-preview', express.json(), async (req, res) => {
|
|
|
206
206
|
const { scenarioSlug, scenarioId, path: navPath, dimension } = req.body || {};
|
|
207
207
|
// Dimension is required — the viewport must always be explicitly set to avoid
|
|
208
208
|
// mismatched viewport sizes (e.g., popup content squeezed into a desktop-sized preview).
|
|
209
|
+
let availableDimensions = [];
|
|
210
|
+
try {
|
|
211
|
+
const configPath = path.join(process.cwd(), '.codeyam', 'config.json');
|
|
212
|
+
const config = JSON.parse(fs.readFileSync(configPath, 'utf8'));
|
|
213
|
+
if (config.screenSizes) {
|
|
214
|
+
availableDimensions = Object.keys(config.screenSizes);
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
catch {
|
|
218
|
+
// Config not available
|
|
219
|
+
}
|
|
220
|
+
const dimensionHint = availableDimensions.length > 0
|
|
221
|
+
? ` Available dimensions: ${availableDimensions.map((d) => `"${d}"`).join(', ')}.`
|
|
222
|
+
: '';
|
|
209
223
|
if (!dimension || typeof dimension !== 'string') {
|
|
210
|
-
|
|
224
|
+
res.status(400).json({
|
|
225
|
+
success: false,
|
|
226
|
+
error: `"dimension" is required. Every preview call must specify the viewport dimension explicitly.${dimensionHint}`,
|
|
227
|
+
});
|
|
228
|
+
return;
|
|
229
|
+
}
|
|
230
|
+
// Validate the dimension exists in the project's screenSizes config.
|
|
231
|
+
if (availableDimensions.length > 0 &&
|
|
232
|
+
!availableDimensions.includes(dimension)) {
|
|
233
|
+
res.status(400).json({
|
|
234
|
+
success: false,
|
|
235
|
+
error: `Unknown dimension "${dimension}".${dimensionHint}`,
|
|
236
|
+
});
|
|
237
|
+
return;
|
|
238
|
+
}
|
|
239
|
+
// When a scenarioId is provided, validate the dimension matches the scenario.
|
|
240
|
+
if (scenarioId && availableDimensions.length > 0) {
|
|
211
241
|
try {
|
|
212
|
-
const
|
|
213
|
-
const
|
|
214
|
-
|
|
215
|
-
|
|
242
|
+
const { getDatabase } = await import('../../../packages/database/index.js');
|
|
243
|
+
const db = getDatabase();
|
|
244
|
+
const row = await db
|
|
245
|
+
.selectFrom('editor_scenarios')
|
|
246
|
+
.select(['dimensions', 'viewport_width', 'viewport_height'])
|
|
247
|
+
.where('id', '=', scenarioId)
|
|
248
|
+
.executeTakeFirst();
|
|
249
|
+
if (row) {
|
|
250
|
+
const scenarioDimensions = row.dimensions
|
|
251
|
+
? JSON.parse(row.dimensions)
|
|
252
|
+
: null;
|
|
253
|
+
if (scenarioDimensions &&
|
|
254
|
+
scenarioDimensions.length > 0 &&
|
|
255
|
+
!scenarioDimensions.includes(dimension)) {
|
|
256
|
+
res.status(400).json({
|
|
257
|
+
success: false,
|
|
258
|
+
error: `Dimension "${dimension}" does not match scenario's registered dimensions: ${scenarioDimensions.map((d) => `"${d}"`).join(', ')}. Use one of the scenario's dimensions.`,
|
|
259
|
+
});
|
|
260
|
+
return;
|
|
261
|
+
}
|
|
216
262
|
}
|
|
217
263
|
}
|
|
218
264
|
catch {
|
|
219
|
-
//
|
|
265
|
+
// DB not available — skip validation
|
|
220
266
|
}
|
|
221
|
-
const hint = availableDimensions.length > 0
|
|
222
|
-
? ` Available dimensions: ${availableDimensions.map((d) => `"${d}"`).join(', ')}.`
|
|
223
|
-
: '';
|
|
224
|
-
res.status(400).json({
|
|
225
|
-
success: false,
|
|
226
|
-
error: `"dimension" is required. Every preview call must specify the viewport dimension explicitly.${hint}`,
|
|
227
|
-
});
|
|
228
|
-
return;
|
|
229
267
|
}
|
|
230
268
|
let sessionsNotified = 0;
|
|
231
269
|
let logCleared = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/webserver/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../../src/webserver/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,98 @@ import * as pty from 'node-pty';
|
|
|
7
7
|
import { createMarkerTransformer } from "../utils/scenarioMarkers.js";
|
|
8
8
|
import { IdleDetector } from "./idleDetector.js";
|
|
9
9
|
import { mockStateEventEmitter } from "./mockStateEvents.js";
|
|
10
|
+
/**
|
|
11
|
+
* Strip the raw `claude ...` shell command from suppressed PTY output
|
|
12
|
+
* so it doesn't leak to the user in the fallback timeout path.
|
|
13
|
+
*/
|
|
14
|
+
export function stripClaudeCommand(output) {
|
|
15
|
+
// Find the line containing the claude command and strip everything before
|
|
16
|
+
// and including it (shell prompt, ANSI codes, command echo). Preserve any
|
|
17
|
+
// real output that follows.
|
|
18
|
+
const idx = output.indexOf('claude ');
|
|
19
|
+
if (idx === -1)
|
|
20
|
+
return output;
|
|
21
|
+
// Find the end of the command line (\r or \n after "claude")
|
|
22
|
+
let end = idx;
|
|
23
|
+
while (end < output.length && output[end] !== '\r' && output[end] !== '\n') {
|
|
24
|
+
end++;
|
|
25
|
+
}
|
|
26
|
+
// Skip past trailing \r\n
|
|
27
|
+
while (end < output.length &&
|
|
28
|
+
(output[end] === '\r' || output[end] === '\n')) {
|
|
29
|
+
end++;
|
|
30
|
+
}
|
|
31
|
+
// Strip leading ANSI escape sequences from the remainder
|
|
32
|
+
// (e.g. bracketed paste mode toggles like \x1b[?2004l)
|
|
33
|
+
let rest = output.slice(end);
|
|
34
|
+
rest = rest.replace(/^(\x1b\[[\x20-\x3f]*[\x40-\x7e]|\x1b[()][A-Z0-9])*/, '');
|
|
35
|
+
return rest;
|
|
36
|
+
}
|
|
37
|
+
/**
|
|
38
|
+
* Detect whether a PTY output chunk contains Claude Code's welcome banner.
|
|
39
|
+
* Supports both the old box-drawing format (`╭─── Claude Code ───╮`)
|
|
40
|
+
* and the new block-art format (`▐▛███▜▌ Claude Code`).
|
|
41
|
+
*/
|
|
42
|
+
export function isBannerChunk(data) {
|
|
43
|
+
// Strip ANSI escape sequences before checking — Claude Code's Ink renderer
|
|
44
|
+
// inserts SGR color codes between the banner characters (e.g. ▐\x1b[48;5;16m▛).
|
|
45
|
+
const plain = data.replace(/\x1b\[[0-9;?]*[A-Za-z]|\x1b\][^\x07]*\x07|\x1b[()][A-Z0-9]/g, '');
|
|
46
|
+
return plain.includes('╭') || plain.includes('▐▛');
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Determine whether the startup output filter should be active.
|
|
50
|
+
* The filter strips the raw `claude --session-id ...` command from the
|
|
51
|
+
* terminal so the user never sees it.
|
|
52
|
+
*/
|
|
53
|
+
export function shouldFilterStartup(opts) {
|
|
54
|
+
return opts.hasContext || opts.editorMode;
|
|
55
|
+
}
|
|
56
|
+
/**
|
|
57
|
+
* Manages PTY output suppression during Claude startup.
|
|
58
|
+
*
|
|
59
|
+
* Suppresses all output until the welcome banner arrives, then clears
|
|
60
|
+
* the screen. The claude command is stripped from any chunk that is forwarded
|
|
61
|
+
* (both the banner chunk on the normal path and the buffered output on the
|
|
62
|
+
* fallback timeout path).
|
|
63
|
+
*/
|
|
64
|
+
export class StartupOutputFilter {
|
|
65
|
+
constructor() {
|
|
66
|
+
this.hasClearedScreen = false;
|
|
67
|
+
this.suppressedOutput = '';
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* Process a PTY data chunk. Returns an object describing what action to take:
|
|
71
|
+
* - `type: 'suppress'` — buffer the chunk, send nothing
|
|
72
|
+
* - `type: 'clear-and-send'` — clear screen, then send `data`
|
|
73
|
+
* - `type: 'send'` — send `data` as-is (post-startup)
|
|
74
|
+
*/
|
|
75
|
+
processChunk(data) {
|
|
76
|
+
if (!this.hasClearedScreen && isBannerChunk(data)) {
|
|
77
|
+
this.hasClearedScreen = true;
|
|
78
|
+
const cleaned = stripClaudeCommand(data);
|
|
79
|
+
return { type: 'clear-and-send', data: cleaned };
|
|
80
|
+
}
|
|
81
|
+
if (!this.hasClearedScreen) {
|
|
82
|
+
this.suppressedOutput += data;
|
|
83
|
+
return { type: 'suppress' };
|
|
84
|
+
}
|
|
85
|
+
return { type: 'send', data };
|
|
86
|
+
}
|
|
87
|
+
/**
|
|
88
|
+
* Called when the fallback timeout fires (╭ never arrived).
|
|
89
|
+
* Returns the buffered output with the command stripped, or null if
|
|
90
|
+
* the screen was already cleared.
|
|
91
|
+
*/
|
|
92
|
+
getTimeoutOutput() {
|
|
93
|
+
if (this.hasClearedScreen)
|
|
94
|
+
return null;
|
|
95
|
+
this.hasClearedScreen = true;
|
|
96
|
+
if (this.suppressedOutput.length === 0)
|
|
97
|
+
return null;
|
|
98
|
+
const cleaned = stripClaudeCommand(this.suppressedOutput);
|
|
99
|
+
return cleaned.length > 0 ? cleaned : null;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
10
102
|
// Use globalThis so the sessions Set is shared across module instances.
|
|
11
103
|
// In Vite dev mode, this file is loaded twice: once by the Vite plugin (Node.js native)
|
|
12
104
|
// and once by the SSR context (ssrLoadModule). Without globalThis, each instance
|
|
@@ -234,9 +326,10 @@ function writeEditorModeContext(ctx) {
|
|
|
234
326
|
`- **Proxy:** http://localhost:${proxyPort} (used by the browser iframe only — do NOT use for health checks)`,
|
|
235
327
|
'',
|
|
236
328
|
'## Workflow',
|
|
237
|
-
'- **Guided steps:** Run `codeyam editor steps` for the next step (plan → prototype → confirm → deconstruct → extract → glossary → analyze → app scenarios → user scenarios → verify → journal → review → present → commit → finalize → push)',
|
|
238
|
-
'- Each feature follows
|
|
239
|
-
'-
|
|
329
|
+
'- **Guided steps:** Run `codeyam editor steps` for the next step (plan → prepare → prototype → verify prototype → confirm → deconstruct → extract → glossary → analyze → app scenarios → user scenarios → verify → journal → review → present → commit → finalize → push)',
|
|
330
|
+
'- Each feature follows 18 steps — run `codeyam editor steps` to see what to do next. Never expose `codeyam editor` commands to the user.',
|
|
331
|
+
'- **Run ONE step at a time.** Read the FULL output, complete every checklist item, then advance. NEVER batch-run steps in a loop or delegate them to a subagent.',
|
|
332
|
+
'- Steps 1, 5, 15, and 18 require user confirmation before proceeding',
|
|
240
333
|
'',
|
|
241
334
|
'## Preview Updates',
|
|
242
335
|
'- **Refresh the preview frequently** — the user watches the preview as you work. Refresh after every meaningful change (new page, UI section, data seeding, styling), not just at the end.',
|
|
@@ -299,7 +392,7 @@ function writeEditorModeContext(ctx) {
|
|
|
299
392
|
const hasPackageJson = fs.existsSync(path.join(codeyamRoot, 'package.json'));
|
|
300
393
|
if (!hasPackageJson) {
|
|
301
394
|
lines.push('## Status');
|
|
302
|
-
lines.push('- **Empty project** — no package.json found.
|
|
395
|
+
lines.push('- **Empty project** — no package.json found. Run `codeyam editor steps` to begin.');
|
|
303
396
|
lines.push('');
|
|
304
397
|
}
|
|
305
398
|
fs.writeFileSync(contextPath, lines.join('\n'), 'utf8');
|
|
@@ -360,6 +453,7 @@ export function attachTerminalServer(httpServer) {
|
|
|
360
453
|
const reconnectId = url.searchParams.get('reconnectId') || '';
|
|
361
454
|
const claudeStartMode = url.searchParams.get('claudeStartMode') || '';
|
|
362
455
|
const claudeSessionId = url.searchParams.get('claudeSessionId') || '';
|
|
456
|
+
const editorStepLabel = url.searchParams.get('editorStepLabel') || '';
|
|
363
457
|
// --- Reconnection: reattach to a detached PTY ---
|
|
364
458
|
if (reconnectId && detachedPtys.has(reconnectId)) {
|
|
365
459
|
const detached = detachedPtys.get(reconnectId);
|
|
@@ -397,14 +491,14 @@ export function attachTerminalServer(httpServer) {
|
|
|
397
491
|
ws.send(JSON.stringify({ type: 'claude-active' }));
|
|
398
492
|
}
|
|
399
493
|
},
|
|
400
|
-
});
|
|
494
|
+
}, { activeOutputPattern: /[✶✢·◼]/ });
|
|
401
495
|
detached.ptyProcess.onData((data) => {
|
|
402
496
|
if (detachedFlag)
|
|
403
497
|
return; // Superseded by a newer listener
|
|
404
498
|
if (ws.readyState === WebSocket.OPEN) {
|
|
405
499
|
if (!detached.hasClearedScreen &&
|
|
406
500
|
detached.hasContext &&
|
|
407
|
-
data
|
|
501
|
+
isBannerChunk(data)) {
|
|
408
502
|
detached.hasClearedScreen = true;
|
|
409
503
|
ws.send(JSON.stringify({ type: 'output', data: '\x1b[2J\x1b[H' }));
|
|
410
504
|
}
|
|
@@ -412,7 +506,7 @@ export function attachTerminalServer(httpServer) {
|
|
|
412
506
|
if (transformed.length > 0) {
|
|
413
507
|
ws.send(JSON.stringify({ type: 'output', data: transformed }));
|
|
414
508
|
}
|
|
415
|
-
reconnectIdleDetector.onPtyOutput(data
|
|
509
|
+
reconnectIdleDetector.onPtyOutput(data);
|
|
416
510
|
}
|
|
417
511
|
});
|
|
418
512
|
detached.ptyProcess.onExit(() => {
|
|
@@ -500,13 +594,24 @@ export function attachTerminalServer(httpServer) {
|
|
|
500
594
|
projectSlug,
|
|
501
595
|
});
|
|
502
596
|
let hasClearedScreen = false;
|
|
597
|
+
const filterStartup = shouldFilterStartup({ hasContext, editorMode });
|
|
598
|
+
const startupFilter = filterStartup ? new StartupOutputFilter() : null;
|
|
503
599
|
// Safety timeout: stop suppressing output after 5s even if ╭ never arrives.
|
|
504
600
|
// Prevents "Starting Claude..." hanging forever if the banner format changes.
|
|
505
|
-
if (
|
|
601
|
+
if (filterStartup) {
|
|
506
602
|
setTimeout(() => {
|
|
507
|
-
|
|
603
|
+
const output = startupFilter.getTimeoutOutput();
|
|
604
|
+
if (output !== null) {
|
|
508
605
|
hasClearedScreen = true;
|
|
509
606
|
console.log('[terminalServer] Suppression timeout — showing output');
|
|
607
|
+
if (ws.readyState === WebSocket.OPEN) {
|
|
608
|
+
// Clear the "Starting Claude..." message
|
|
609
|
+
ws.send(JSON.stringify({ type: 'output', data: '\x1b[2J\x1b[H' }));
|
|
610
|
+
const transformed = transformMarkers(output);
|
|
611
|
+
if (transformed.length > 0) {
|
|
612
|
+
ws.send(JSON.stringify({ type: 'output', data: transformed }));
|
|
613
|
+
}
|
|
614
|
+
}
|
|
510
615
|
}
|
|
511
616
|
}, 5000);
|
|
512
617
|
}
|
|
@@ -521,7 +626,7 @@ export function attachTerminalServer(httpServer) {
|
|
|
521
626
|
ws.send(JSON.stringify({ type: 'claude-active' }));
|
|
522
627
|
}
|
|
523
628
|
},
|
|
524
|
-
});
|
|
629
|
+
}, { activeOutputPattern: /[✶✢·◼]/ });
|
|
525
630
|
// PTY output -> WebSocket
|
|
526
631
|
const serverPort = process.env.CODEYAM_PORT || '3111';
|
|
527
632
|
// Stateful transformer that buffers partial {{scenario:...}} markers
|
|
@@ -529,19 +634,22 @@ export function attachTerminalServer(httpServer) {
|
|
|
529
634
|
const transformMarkers = createMarkerTransformer(serverPort);
|
|
530
635
|
ptyProcess.onData((data) => {
|
|
531
636
|
if (ws.readyState === WebSocket.OPEN) {
|
|
532
|
-
//
|
|
533
|
-
// clear
|
|
534
|
-
if (
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
637
|
+
// During startup, suppress output until Claude's welcome banner (╭)
|
|
638
|
+
// arrives, then clear screen and strip the raw command from the chunk.
|
|
639
|
+
if (startupFilter && !hasClearedScreen) {
|
|
640
|
+
const result = startupFilter.processChunk(data);
|
|
641
|
+
if (result.type === 'clear-and-send') {
|
|
642
|
+
hasClearedScreen = true;
|
|
643
|
+
ws.send(JSON.stringify({ type: 'output', data: '\x1b[2J\x1b[H' }));
|
|
644
|
+
if (result.data.length > 0) {
|
|
645
|
+
const transformed = transformMarkers(result.data);
|
|
646
|
+
if (transformed.length > 0) {
|
|
647
|
+
ws.send(JSON.stringify({ type: 'output', data: transformed }));
|
|
648
|
+
}
|
|
649
|
+
}
|
|
650
|
+
idleDetector.onPtyOutput(data);
|
|
651
|
+
}
|
|
652
|
+
// type === 'suppress': skip sending and idle detection
|
|
545
653
|
}
|
|
546
654
|
else {
|
|
547
655
|
// Transform {{scenario:Name:ID}} markers into OSC 8 clickable hyperlinks.
|
|
@@ -550,7 +658,7 @@ export function attachTerminalServer(httpServer) {
|
|
|
550
658
|
if (transformed.length > 0) {
|
|
551
659
|
ws.send(JSON.stringify({ type: 'output', data: transformed }));
|
|
552
660
|
}
|
|
553
|
-
idleDetector.onPtyOutput(data
|
|
661
|
+
idleDetector.onPtyOutput(data);
|
|
554
662
|
}
|
|
555
663
|
}
|
|
556
664
|
});
|
|
@@ -592,7 +700,7 @@ export function attachTerminalServer(httpServer) {
|
|
|
592
700
|
// Show a loading indicator while Claude Code starts up.
|
|
593
701
|
// PTY output is suppressed until Claude's welcome banner (╭) appears
|
|
594
702
|
// and triggers a screen clear, so the user never sees the raw command.
|
|
595
|
-
if (
|
|
703
|
+
if (filterStartup) {
|
|
596
704
|
ws.send(JSON.stringify({
|
|
597
705
|
type: 'output',
|
|
598
706
|
data: '\x1b[2J\x1b[H\r\n\x1b[90m Starting Claude...\x1b[0m\r\n',
|
|
@@ -612,11 +720,17 @@ export function attachTerminalServer(httpServer) {
|
|
|
612
720
|
setTimeout(() => {
|
|
613
721
|
if (editorMode && hasContext) {
|
|
614
722
|
if (claudeStartMode === 'resume' && claudeSessionId) {
|
|
615
|
-
|
|
723
|
+
const resumePrompt = editorStepLabel === 'Present'
|
|
724
|
+
? 'The session was interrupted. Please rerun show-results.'
|
|
725
|
+
: 'The session was interrupted. Please continue where you left off.';
|
|
726
|
+
ptyProcess.write(`claude --resume '${claudeSessionId}' '${resumePrompt}'\r`);
|
|
616
727
|
}
|
|
617
728
|
else if (claudeStartMode === 'resume') {
|
|
618
729
|
// No session ID available — fall back to most recent session
|
|
619
|
-
|
|
730
|
+
const resumePrompt = editorStepLabel === 'Present'
|
|
731
|
+
? 'The session was interrupted. Please rerun show-results.'
|
|
732
|
+
: 'The session was interrupted. Please continue where you left off.';
|
|
733
|
+
ptyProcess.write(`claude --continue '${resumePrompt}'\r`);
|
|
620
734
|
}
|
|
621
735
|
else {
|
|
622
736
|
// Fresh session: generate a trackable UUID
|