dsh-better-display 0.3.8 → 0.3.10
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/CHANGELOG.md +11 -0
- package/DESIGN.md +43 -3
- package/README.en.md +10 -2
- package/README.md +10 -2
- package/compat/harness-rc2.json +17 -13
- package/docs/dependency-update-policy.md +9 -0
- package/docs/extension-points.md +172 -0
- package/docs/official-rendering-bridge.md +49 -20
- package/docs/openapi.yaml +147 -0
- package/docs/runbooks/blank-reader.md +39 -0
- package/lib/client.js +1802 -872
- package/lib/client.js.map +1 -1
- package/lib/dsh-better-display.js +376 -151
- package/lib/types/client/AssistantNode.d.ts +20 -0
- package/lib/types/client/AssistantNode.d.ts.map +1 -0
- package/lib/types/client/AssistantNode.js +46 -0
- package/lib/types/client/AssistantNode.js.map +1 -0
- package/lib/types/client/Blocks.d.ts.map +1 -1
- package/lib/types/client/Blocks.js +33 -10
- package/lib/types/client/Blocks.js.map +1 -1
- package/lib/types/client/ChoreographedFlow.d.ts.map +1 -1
- package/lib/types/client/ChoreographedFlow.js +2 -0
- package/lib/types/client/ChoreographedFlow.js.map +1 -1
- package/lib/types/client/ClosedProcessSummary.d.ts.map +1 -1
- package/lib/types/client/ClosedProcessSummary.js +3 -1
- package/lib/types/client/ClosedProcessSummary.js.map +1 -1
- package/lib/types/client/McpAppFrame.d.ts.map +1 -1
- package/lib/types/client/McpAppFrame.js +5 -11
- package/lib/types/client/McpAppFrame.js.map +1 -1
- package/lib/types/client/OfficialContent.d.ts +17 -3
- package/lib/types/client/OfficialContent.d.ts.map +1 -1
- package/lib/types/client/OfficialContent.js +37 -12
- package/lib/types/client/OfficialContent.js.map +1 -1
- package/lib/types/client/Reader.d.ts.map +1 -1
- package/lib/types/client/Reader.js +45 -77
- package/lib/types/client/Reader.js.map +1 -1
- package/lib/types/client/SettingsSection.d.ts.map +1 -1
- package/lib/types/client/SettingsSection.js +0 -5
- package/lib/types/client/SettingsSection.js.map +1 -1
- package/lib/types/client/StickyLane.d.ts +12 -0
- package/lib/types/client/StickyLane.d.ts.map +1 -1
- package/lib/types/client/StickyLane.js +78 -2
- package/lib/types/client/StickyLane.js.map +1 -1
- package/lib/types/client/ToolActivity.js.map +1 -1
- package/lib/types/client/index.d.ts +3 -1
- package/lib/types/client/index.d.ts.map +1 -1
- package/lib/types/client/index.js +6 -0
- package/lib/types/client/index.js.map +1 -1
- package/lib/types/client/live-turn.d.ts +17 -5
- package/lib/types/client/live-turn.d.ts.map +1 -1
- package/lib/types/client/live-turn.js +106 -76
- package/lib/types/client/live-turn.js.map +1 -1
- package/lib/types/client/motion.d.ts +26 -2
- package/lib/types/client/motion.d.ts.map +1 -1
- package/lib/types/client/motion.js +136 -10
- package/lib/types/client/motion.js.map +1 -1
- package/lib/types/client/official-slots.d.ts +24 -3
- package/lib/types/client/official-slots.d.ts.map +1 -1
- package/lib/types/client/official-slots.js +59 -11
- package/lib/types/client/official-slots.js.map +1 -1
- package/lib/types/client/primitive-labels.d.ts.map +1 -1
- package/lib/types/client/primitive-labels.js +1 -0
- package/lib/types/client/primitive-labels.js.map +1 -1
- package/lib/types/client/projection.d.ts +15 -2
- package/lib/types/client/projection.d.ts.map +1 -1
- package/lib/types/client/projection.js +16 -4
- package/lib/types/client/projection.js.map +1 -1
- package/lib/types/client/rewind-cut.d.ts +131 -0
- package/lib/types/client/rewind-cut.d.ts.map +1 -0
- package/lib/types/client/rewind-cut.js +321 -0
- package/lib/types/client/rewind-cut.js.map +1 -0
- package/lib/types/client/text-transform.d.ts +93 -0
- package/lib/types/client/text-transform.d.ts.map +1 -0
- package/lib/types/client/text-transform.js +183 -0
- package/lib/types/client/text-transform.js.map +1 -0
- package/lib/types/client/timeline.d.ts.map +1 -1
- package/lib/types/client/timeline.js.map +1 -1
- package/lib/types/client/tool-activity.d.ts +9 -2
- package/lib/types/client/tool-activity.d.ts.map +1 -1
- package/lib/types/client/tool-activity.js +42 -2
- package/lib/types/client/tool-activity.js.map +1 -1
- package/lib/types/client/turn-slots.d.ts +29 -0
- package/lib/types/client/turn-slots.d.ts.map +1 -0
- package/lib/types/client/turn-slots.js +62 -0
- package/lib/types/client/turn-slots.js.map +1 -0
- package/lib/types/client/types.d.ts +18 -0
- package/lib/types/client/types.d.ts.map +1 -1
- package/lib/types/dsh-better-display.d.ts +4 -1
- package/lib/types/dsh-better-display.d.ts.map +1 -1
- package/lib/types/dsh-better-display.js +56 -7
- package/lib/types/dsh-better-display.js.map +1 -1
- package/lib/types/flags.d.ts +7 -0
- package/lib/types/flags.d.ts.map +1 -0
- package/lib/types/flags.js +37 -0
- package/lib/types/flags.js.map +1 -0
- package/lib/types/log.d.ts +17 -0
- package/lib/types/log.d.ts.map +1 -0
- package/lib/types/log.js +122 -0
- package/lib/types/log.js.map +1 -0
- package/lib/types/metrics.d.ts +18 -0
- package/lib/types/metrics.d.ts.map +1 -0
- package/lib/types/metrics.js +35 -0
- package/lib/types/metrics.js.map +1 -0
- package/package.json +55 -23
- package/scripts/changelog.mjs +20 -0
- package/scripts/check-agents-md.mjs +67 -0
- package/scripts/check-bundle-size.mjs +38 -0
- package/scripts/check-dead-flags.mjs +55 -0
- package/scripts/check-harness-compat.mjs +4 -2
- package/scripts/check-todo-debt.mjs +69 -0
- package/scripts/link-harness-dependencies.mjs +48 -11
- package/scripts/security-audit-report.mjs +92 -0
- package/scripts/verify-commentary-visible.mjs +627 -0
- package/src/client/AssistantNode.tsx +72 -0
- package/src/client/Blocks.tsx +49 -10
- package/src/client/ChoreographedFlow.tsx +3 -1
- package/src/client/ClosedProcessSummary.tsx +3 -1
- package/src/client/McpAppFrame.tsx +5 -13
- package/src/client/OfficialContent.tsx +52 -14
- package/src/client/Reader.module.css +68 -18
- package/src/client/Reader.tsx +38 -82
- package/src/client/SettingsSection.tsx +1 -7
- package/src/client/StickyLane.tsx +81 -2
- package/src/client/ToolActivity.tsx +1 -1
- package/src/client/index.tsx +8 -1
- package/src/client/live-turn.ts +100 -69
- package/src/client/motion.tsx +135 -7
- package/src/client/official-slots.tsx +61 -12
- package/src/client/primitive-labels.ts +1 -0
- package/src/client/projection.ts +16 -4
- package/src/client/rewind-cut.ts +340 -0
- package/src/client/text-transform.ts +265 -0
- package/src/client/timeline.ts +0 -2
- package/src/client/tool-activity.ts +49 -2
- package/src/client/turn-slots.ts +80 -0
- package/src/client/types.ts +19 -0
- package/src/dsh-better-display.ts +58 -7
- package/src/flags.ts +40 -0
- package/src/log.ts +137 -0
- package/src/metrics.ts +50 -0
- package/tests/browser-commentary.tsx +191 -0
- package/tests/browser-official-bridge.tsx +2 -1
- package/tests/chat-flow-hook.test.ts +1 -1
- package/tests/cloud-gate.test.ts +1 -1
- package/tests/context-tool-update.test.ts +1 -1
- package/tests/conversation-scroll.test.ts +1 -1
- package/tests/deliverables.test.ts +1 -1
- package/tests/entry.test.ts +1 -1
- package/tests/fixtures/reader-lane-owners.tsx +46 -0
- package/tests/fixtures/reader-official-users.tsx +64 -0
- package/tests/fixtures/reader-theme-overlap.html +80 -0
- package/tests/fixtures/reader-user-bubble.tsx +244 -0
- package/tests/flags.test.ts +66 -0
- package/tests/fold-choreography.test.ts +32 -8
- package/tests/fold-intensity.test.ts +11 -6
- package/tests/footer-precedence.test.ts +1 -1
- package/tests/history-word-regression.test.ts +1 -1
- package/tests/live-turn.test.ts +125 -54
- package/tests/log.test.ts +99 -0
- package/tests/mcp-apps.test.ts +1 -1
- package/tests/message-chrome.test.ts +1 -1
- package/tests/metrics.test.ts +52 -0
- package/tests/official-slots.test.ts +41 -2
- package/tests/open-file.test.ts +1 -1
- package/tests/pending-submission.test.ts +12 -1
- package/tests/pinned-selection.test.ts +16 -0
- package/tests/platform-media.test.ts +1 -1
- package/tests/projection.test.ts +66 -3
- package/tests/reader-glass-css.test.ts +1 -1
- package/tests/reader-official-users.test.ts +11 -1
- package/tests/reader-sticky-surface.test.ts +377 -0
- package/tests/reader-theme-lanes.test.ts +54 -0
- package/tests/reader-theme-overlap.test.ts +151 -0
- package/tests/reader-user-bubble.test.ts +138 -0
- package/tests/reasoning-follow.test.ts +1 -1
- package/tests/retiring-content.test.ts +98 -6
- package/tests/reveal.test.ts +3 -3
- package/tests/rewind-cut.test.ts +1090 -0
- package/tests/settings-copy.test.ts +1 -1
- package/tests/skill-status.test.ts +1 -1
- package/tests/stock-install.test.ts +11 -7
- package/tests/stream-buffer.test.ts +1 -1
- package/tests/styles.test.ts +30 -3
- package/tests/terminal-input-preview.test.ts +1 -1
- package/tests/text-transform.test.ts +272 -0
- package/tests/timeline.test.ts +1 -1
- package/tests/tool-clock.test.ts +1 -1
- package/tests/tool-diff.test.ts +1 -1
- package/tests/waiting-clock.test.ts +1 -1
- package/tests/word-timeline.test.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACzG,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAClF,OAAO,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,kCAAkC,CAAC;AAIhH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AACpD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAGlG,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,cAAc,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/client/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from 'node:http';
|
|
2
2
|
import type { Context } from '@deepseek-ai/cordis';
|
|
3
|
+
import { type Flags } from './flags.js';
|
|
3
4
|
declare module '@deepseek-ai/cordis' {
|
|
4
5
|
interface Context {
|
|
5
6
|
webServer?: {
|
|
@@ -13,5 +14,7 @@ declare module '@deepseek-ai/cordis' {
|
|
|
13
14
|
}
|
|
14
15
|
export declare const name = "dsh-better-display";
|
|
15
16
|
export declare const inject: string[];
|
|
16
|
-
export declare function apply(ctx: Context
|
|
17
|
+
export declare function apply(ctx: Context, options?: {
|
|
18
|
+
readonly flags?: Flags;
|
|
19
|
+
}): void;
|
|
17
20
|
//# sourceMappingURL=dsh-better-display.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dsh-better-display.d.ts","sourceRoot":"","sources":["../../src/dsh-better-display.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"dsh-better-display.d.ts","sourceRoot":"","sources":["../../src/dsh-better-display.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,EAAa,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAOnD,OAAO,QAAQ,qBAAqB,CAAC;IACnC,UAAU,OAAO;QACf,SAAS,CAAC,EAAE;YACV,QAAQ,EAAE,CAAC,KAAK,EAAE;gBAChB,IAAI,EAAE,OAAO,GAAG,QAAQ,CAAC;gBACzB,IAAI,EAAE,MAAM,CAAC;gBACb,OAAO,EAAE,CAAC,GAAG,EAAE,eAAe,EAAE,GAAG,EAAE,cAAc,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;aAC9E,KAAK,MAAM,IAAI,CAAC;SAClB,CAAC;KACH;CACF;AAED,eAAO,MAAM,IAAI,uBAAuB,CAAC;AACzC,eAAO,MAAM,MAAM,UAAgB,CAAC;AAkCpC,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,GAAG,IAAI,CAkE9E"}
|
|
@@ -1,8 +1,12 @@
|
|
|
1
|
+
import { loadFlags } from './flags.js';
|
|
2
|
+
import { createLogger, requestIdOf } from './log.js';
|
|
3
|
+
import { metricsPayload, recordRouteDuration, recordRouteHit, ROUTE_METRICS, ROUTE_REVEAL, ROUTE_SKILL_STATUS } from './metrics.js';
|
|
4
|
+
import { createRevealHandler, revealRoots } from './reveal.js';
|
|
1
5
|
import { scanGenerativeMcpappsStatus } from './skill-roots.js';
|
|
2
6
|
import { skillsFromListResult, toPublicSkillStatus } from './skill-status.js';
|
|
3
|
-
import { createRevealHandler, revealRoots } from './reveal.js';
|
|
4
7
|
export const name = 'dsh-better-display';
|
|
5
8
|
export const inject = ['webServer'];
|
|
9
|
+
const log = createLogger({ base: { plugin: name } });
|
|
6
10
|
function writeJson(res, status, body) {
|
|
7
11
|
res.setHeader('Content-Type', 'application/json');
|
|
8
12
|
res.statusCode = status;
|
|
@@ -14,19 +18,46 @@ function skillLister(ctx) {
|
|
|
14
18
|
return undefined;
|
|
15
19
|
return async () => skillsFromListResult(await skills.list({}));
|
|
16
20
|
}
|
|
17
|
-
|
|
18
|
-
|
|
21
|
+
function beginRequest(req, res, route) {
|
|
22
|
+
const requestId = requestIdOf(req);
|
|
23
|
+
res.setHeader('X-Request-ID', requestId);
|
|
24
|
+
recordRouteHit(route);
|
|
25
|
+
const started = performance.now();
|
|
26
|
+
res.on('finish', () => {
|
|
27
|
+
recordRouteDuration(route, performance.now() - started);
|
|
28
|
+
});
|
|
29
|
+
log.info('http request', {
|
|
30
|
+
requestId,
|
|
31
|
+
route,
|
|
32
|
+
method: req.method ?? '',
|
|
33
|
+
url: req.url ?? '',
|
|
34
|
+
headers: req.headers,
|
|
35
|
+
});
|
|
36
|
+
return requestId;
|
|
37
|
+
}
|
|
38
|
+
export function apply(ctx, options) {
|
|
39
|
+
const flags = options?.flags ?? loadFlags();
|
|
40
|
+
log.info('[my-plugins/dsh-better-display] loaded', { readerEnabled: flags.readerEnabled });
|
|
41
|
+
if (!flags.readerEnabled) {
|
|
42
|
+
log.info('route registration skipped', { readerEnabled: false });
|
|
43
|
+
return;
|
|
44
|
+
}
|
|
19
45
|
if (ctx.webServer) {
|
|
20
46
|
ctx.effect(() => {
|
|
47
|
+
const reveal = createRevealHandler({ roots: sessionId => revealRoots(ctx, sessionId) });
|
|
21
48
|
const disposeReveal = ctx.webServer.register({
|
|
22
49
|
kind: 'exact',
|
|
23
|
-
path:
|
|
24
|
-
handler:
|
|
50
|
+
path: ROUTE_REVEAL,
|
|
51
|
+
handler: (req, res) => {
|
|
52
|
+
beginRequest(req, res, ROUTE_REVEAL);
|
|
53
|
+
reveal(req, res);
|
|
54
|
+
},
|
|
25
55
|
});
|
|
26
56
|
const disposeSkill = ctx.webServer.register({
|
|
27
57
|
kind: 'exact',
|
|
28
|
-
path:
|
|
58
|
+
path: ROUTE_SKILL_STATUS,
|
|
29
59
|
handler: async (req, res) => {
|
|
60
|
+
const requestId = beginRequest(req, res, ROUTE_SKILL_STATUS);
|
|
30
61
|
if (req.method !== 'GET') {
|
|
31
62
|
res.statusCode = 405;
|
|
32
63
|
res.end();
|
|
@@ -42,15 +73,33 @@ export function apply(ctx) {
|
|
|
42
73
|
writeJson(res, 200, toPublicSkillStatus(status));
|
|
43
74
|
}
|
|
44
75
|
catch (err) {
|
|
76
|
+
log.error('skill-status failed', {
|
|
77
|
+
requestId,
|
|
78
|
+
error: err instanceof Error ? err.message : String(err),
|
|
79
|
+
});
|
|
45
80
|
writeJson(res, 500, { ok: false, error: String(err) });
|
|
46
81
|
}
|
|
47
82
|
},
|
|
48
83
|
});
|
|
84
|
+
const disposeMetrics = ctx.webServer.register({
|
|
85
|
+
kind: 'exact',
|
|
86
|
+
path: ROUTE_METRICS,
|
|
87
|
+
handler: (req, res) => {
|
|
88
|
+
beginRequest(req, res, ROUTE_METRICS);
|
|
89
|
+
if (req.method !== 'GET') {
|
|
90
|
+
res.statusCode = 405;
|
|
91
|
+
res.end();
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
writeJson(res, 200, metricsPayload());
|
|
95
|
+
},
|
|
96
|
+
});
|
|
49
97
|
return () => {
|
|
50
98
|
disposeReveal();
|
|
51
99
|
disposeSkill();
|
|
100
|
+
disposeMetrics();
|
|
52
101
|
};
|
|
53
|
-
}, 'dsh-better-display: reveal
|
|
102
|
+
}, 'dsh-better-display: reveal, skill-status, and metrics routes');
|
|
54
103
|
}
|
|
55
104
|
}
|
|
56
105
|
//# sourceMappingURL=dsh-better-display.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dsh-better-display.js","sourceRoot":"","sources":["../../src/dsh-better-display.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dsh-better-display.js","sourceRoot":"","sources":["../../src/dsh-better-display.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
/** Startup kill switch loaded from flags.json. This is not the reader glass setting. */
|
|
2
|
+
export interface Flags {
|
|
3
|
+
readonly readerEnabled: boolean;
|
|
4
|
+
}
|
|
5
|
+
export declare const defaultFlags: Flags;
|
|
6
|
+
export declare function loadFlags(source?: string | Flags): Flags;
|
|
7
|
+
//# sourceMappingURL=flags.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flags.d.ts","sourceRoot":"","sources":["../../src/flags.ts"],"names":[],"mappings":"AAIA,wFAAwF;AACxF,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED,eAAO,MAAM,YAAY,EAAE,KAA+B,CAAC;AAqB3D,wBAAgB,SAAS,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,KAAK,GAAG,KAAK,CASxD"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { existsSync, readFileSync } from 'node:fs';
|
|
2
|
+
import { dirname, resolve } from 'node:path';
|
|
3
|
+
import { fileURLToPath } from 'node:url';
|
|
4
|
+
export const defaultFlags = { readerEnabled: true };
|
|
5
|
+
function locateFlags(start = dirname(fileURLToPath(import.meta.url))) {
|
|
6
|
+
let dir = start;
|
|
7
|
+
for (let depth = 0; depth < 6; depth += 1) {
|
|
8
|
+
const candidate = resolve(dir, 'flags.json');
|
|
9
|
+
if (existsSync(candidate))
|
|
10
|
+
return candidate;
|
|
11
|
+
const parent = dirname(dir);
|
|
12
|
+
if (parent === dir)
|
|
13
|
+
return undefined;
|
|
14
|
+
dir = parent;
|
|
15
|
+
}
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
function normalize(value) {
|
|
19
|
+
const record = value !== null && typeof value === 'object' ? value : {};
|
|
20
|
+
return {
|
|
21
|
+
readerEnabled: typeof record.readerEnabled === 'boolean' ? record.readerEnabled : defaultFlags.readerEnabled,
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
export function loadFlags(source) {
|
|
25
|
+
if (source !== undefined && typeof source !== 'string')
|
|
26
|
+
return normalize(source);
|
|
27
|
+
try {
|
|
28
|
+
const path = typeof source === 'string' ? source : locateFlags();
|
|
29
|
+
if (path === undefined || !existsSync(path))
|
|
30
|
+
return { ...defaultFlags };
|
|
31
|
+
return normalize(JSON.parse(readFileSync(path, 'utf8')));
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return { ...defaultFlags };
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=flags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flags.js","sourceRoot":"","sources":["../../src/flags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAOzC,MAAM,CAAC,MAAM,YAAY,GAAU,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC;AAE3D,SAAS,WAAW,CAAC,KAAK,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClE,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAC7C,IAAI,UAAU,CAAC,SAAS,CAAC;YAAE,OAAO,SAAS,CAAC;QAC5C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,IAAI,MAAM,KAAK,GAAG;YAAE,OAAO,SAAS,CAAC;QACrC,GAAG,GAAG,MAAM,CAAC;IACf,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,SAAS,CAAC,KAAc;IAC/B,MAAM,MAAM,GAAG,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAoC,CAAC,CAAC,CAAC,EAAE,CAAC;IACvG,OAAO;QACL,aAAa,EAAE,OAAO,MAAM,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa;KAC7G,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAuB;IAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;IACjF,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;QACjE,IAAI,IAAI,KAAK,SAAS,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;QACxE,OAAO,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAY,CAAC,CAAC;IACtE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,GAAG,YAAY,EAAE,CAAC;IAC7B,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import type { IncomingMessage } from 'node:http';
|
|
2
|
+
export declare const REDACTED = "[REDACTED]";
|
|
3
|
+
export type LogFields = Record<string, unknown>;
|
|
4
|
+
export interface Logger {
|
|
5
|
+
info(msg: string, fields?: LogFields): void;
|
|
6
|
+
warn(msg: string, fields?: LogFields): void;
|
|
7
|
+
error(msg: string, fields?: LogFields): void;
|
|
8
|
+
}
|
|
9
|
+
export interface LoggerOptions {
|
|
10
|
+
readonly write?: (line: string) => void;
|
|
11
|
+
readonly base?: LogFields;
|
|
12
|
+
readonly clock?: () => Date;
|
|
13
|
+
}
|
|
14
|
+
export declare function redact(value: unknown): unknown;
|
|
15
|
+
export declare function createLogger(options?: LoggerOptions): Logger;
|
|
16
|
+
export declare function requestIdOf(req: IncomingMessage): string;
|
|
17
|
+
//# sourceMappingURL=log.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log.d.ts","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAEjD,eAAO,MAAM,QAAQ,eAAe,CAAC;AAiCrC,MAAM,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEhD,MAAM,WAAW,MAAM;IACrB,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5C,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;IAC5C,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,SAAS,GAAG,IAAI,CAAC;CAC9C;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,IAAI,CAAC;CAC7B;AA+BD,wBAAgB,MAAM,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAE9C;AAwBD,wBAAgB,YAAY,CAAC,OAAO,GAAE,aAAkB,GAAG,MAAM,CAwBhE;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,eAAe,GAAG,MAAM,CAKxD"}
|
package/lib/types/log.js
ADDED
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
import { randomUUID } from 'node:crypto';
|
|
2
|
+
export const REDACTED = '[REDACTED]';
|
|
3
|
+
const REQUEST_ID_HEADER = 'x-request-id';
|
|
4
|
+
const REQUEST_ID_PATTERN = /^[A-Za-z0-9._:-]{1,200}$/;
|
|
5
|
+
const SECRET_KEYS = new Set([
|
|
6
|
+
'authorization',
|
|
7
|
+
'proxyauthorization',
|
|
8
|
+
'cookie',
|
|
9
|
+
'setcookie',
|
|
10
|
+
'token',
|
|
11
|
+
'accesstoken',
|
|
12
|
+
'refreshtoken',
|
|
13
|
+
'idtoken',
|
|
14
|
+
'apikey',
|
|
15
|
+
'apisecret',
|
|
16
|
+
'secret',
|
|
17
|
+
'clientsecret',
|
|
18
|
+
'password',
|
|
19
|
+
'passwd',
|
|
20
|
+
'credential',
|
|
21
|
+
'credentials',
|
|
22
|
+
'signature',
|
|
23
|
+
'sig',
|
|
24
|
+
'jwt',
|
|
25
|
+
'bearer',
|
|
26
|
+
'privatekey',
|
|
27
|
+
'xapikey',
|
|
28
|
+
'xauthtoken',
|
|
29
|
+
'xaccesstoken',
|
|
30
|
+
'auth',
|
|
31
|
+
]);
|
|
32
|
+
function normalizeKey(key) {
|
|
33
|
+
return key.toLowerCase().replace(/[^a-z0-9]/g, '');
|
|
34
|
+
}
|
|
35
|
+
function isSecretKey(key) {
|
|
36
|
+
const normalized = normalizeKey(key);
|
|
37
|
+
if (SECRET_KEYS.has(normalized))
|
|
38
|
+
return true;
|
|
39
|
+
if (normalized === 'requestid' || normalized === 'xrequestid')
|
|
40
|
+
return false;
|
|
41
|
+
return /(?:^|[^a-z])(?:token|secret|password|api[-_]?key)$/i.test(key);
|
|
42
|
+
}
|
|
43
|
+
function redactString(value) {
|
|
44
|
+
const query = value.replace(/([?&#])([^&#=]+)=([^&#]*)/g, (match, sep, rawKey) => {
|
|
45
|
+
let key;
|
|
46
|
+
try {
|
|
47
|
+
key = decodeURIComponent(rawKey.replace(/\+/g, ' '));
|
|
48
|
+
}
|
|
49
|
+
catch {
|
|
50
|
+
key = rawKey;
|
|
51
|
+
}
|
|
52
|
+
return isSecretKey(key) ? `${sep}${rawKey}=${REDACTED}` : match;
|
|
53
|
+
});
|
|
54
|
+
return query
|
|
55
|
+
.replace(/\b(Bearer|Basic)\s+\S+/gi, `$1 ${REDACTED}`)
|
|
56
|
+
.replace(/\b((?:access[_-]?token|refresh[_-]?token|id[_-]?token|api[_-]?key|client[_-]?secret|password|passwd|authorization|token|secret))(\s*[:=]\s*)([^\s&]+)/gi, `$1$2${REDACTED}`);
|
|
57
|
+
}
|
|
58
|
+
export function redact(value) {
|
|
59
|
+
return redactValue(undefined, value, 0, new WeakSet());
|
|
60
|
+
}
|
|
61
|
+
function redactValue(key, value, depth, seen) {
|
|
62
|
+
if (key !== undefined && isSecretKey(key))
|
|
63
|
+
return REDACTED;
|
|
64
|
+
if (depth > 8)
|
|
65
|
+
return REDACTED;
|
|
66
|
+
if (typeof value === 'string')
|
|
67
|
+
return redactString(value);
|
|
68
|
+
if (typeof value === 'number' || typeof value === 'boolean' || value === null || value === undefined)
|
|
69
|
+
return value;
|
|
70
|
+
if (typeof value !== 'object')
|
|
71
|
+
return REDACTED;
|
|
72
|
+
if (value instanceof Date)
|
|
73
|
+
return value.toISOString();
|
|
74
|
+
if (value instanceof Error) {
|
|
75
|
+
return redactValue(undefined, { name: value.name, message: value.message }, depth + 1, seen);
|
|
76
|
+
}
|
|
77
|
+
if (seen.has(value))
|
|
78
|
+
return REDACTED;
|
|
79
|
+
seen.add(value);
|
|
80
|
+
if (Array.isArray(value)) {
|
|
81
|
+
return value.map(item => redactValue(undefined, item, depth + 1, seen));
|
|
82
|
+
}
|
|
83
|
+
const output = {};
|
|
84
|
+
for (const [childKey, childValue] of Object.entries(value)) {
|
|
85
|
+
output[childKey] = redactValue(childKey, childValue, depth + 1, seen);
|
|
86
|
+
}
|
|
87
|
+
return output;
|
|
88
|
+
}
|
|
89
|
+
export function createLogger(options = {}) {
|
|
90
|
+
const write = options.write ?? ((line) => {
|
|
91
|
+
console.log(line);
|
|
92
|
+
});
|
|
93
|
+
const clock = options.clock ?? (() => new Date());
|
|
94
|
+
const emit = (level, msg, fields) => {
|
|
95
|
+
const details = redact({ ...options.base, ...fields });
|
|
96
|
+
const record = {
|
|
97
|
+
...(details !== null && typeof details === 'object' ? details : {}),
|
|
98
|
+
time: clock().toISOString(),
|
|
99
|
+
level,
|
|
100
|
+
msg: redactString(msg),
|
|
101
|
+
};
|
|
102
|
+
try {
|
|
103
|
+
write(JSON.stringify(record));
|
|
104
|
+
}
|
|
105
|
+
catch {
|
|
106
|
+
write(JSON.stringify({ time: record.time, level, msg: record.msg, error: 'log record was not serializable' }));
|
|
107
|
+
}
|
|
108
|
+
};
|
|
109
|
+
return {
|
|
110
|
+
info: (msg, fields) => emit('info', msg, fields),
|
|
111
|
+
warn: (msg, fields) => emit('warn', msg, fields),
|
|
112
|
+
error: (msg, fields) => emit('error', msg, fields),
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
export function requestIdOf(req) {
|
|
116
|
+
const raw = req.headers[REQUEST_ID_HEADER];
|
|
117
|
+
const value = Array.isArray(raw) ? raw[0] : raw;
|
|
118
|
+
if (typeof value === 'string' && REQUEST_ID_PATTERN.test(value))
|
|
119
|
+
return value;
|
|
120
|
+
return randomUUID();
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/log.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
export declare const ROUTE_REVEAL = "/better-display/reveal";
|
|
2
|
+
export declare const ROUTE_SKILL_STATUS = "/better-display/skill-status";
|
|
3
|
+
export declare const ROUTE_METRICS = "/better-display/metrics";
|
|
4
|
+
export declare const ROUTE_HITS: readonly ["/better-display/reveal", "/better-display/skill-status", "/better-display/metrics"];
|
|
5
|
+
export interface RouteTiming {
|
|
6
|
+
count: number;
|
|
7
|
+
totalMs: number;
|
|
8
|
+
maxMs: number;
|
|
9
|
+
}
|
|
10
|
+
export declare function recordRouteHit(route: string): number;
|
|
11
|
+
export declare function recordRouteDuration(route: string, elapsedMs: number): RouteTiming;
|
|
12
|
+
export declare function metricsPayload(): {
|
|
13
|
+
counters: {
|
|
14
|
+
dsh_better_display_route_hits_total: Record<string, number>;
|
|
15
|
+
};
|
|
16
|
+
timingsMs: Record<string, RouteTiming>;
|
|
17
|
+
};
|
|
18
|
+
//# sourceMappingURL=metrics.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metrics.d.ts","sourceRoot":"","sources":["../../src/metrics.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,2BAA2B,CAAC;AACrD,eAAO,MAAM,kBAAkB,iCAAiC,CAAC;AACjE,eAAO,MAAM,aAAa,4BAA4B,CAAC;AAEvD,eAAO,MAAM,UAAU,gGAA6D,CAAC;AAErF,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf;AAaD,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAIpD;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,WAAW,CAUjF;AAED,wBAAgB,cAAc,IAAI;IAChC,QAAQ,EAAE;QAAE,mCAAmC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAC1E,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;CACxC,CAKA"}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
export const ROUTE_REVEAL = '/better-display/reveal';
|
|
2
|
+
export const ROUTE_SKILL_STATUS = '/better-display/skill-status';
|
|
3
|
+
export const ROUTE_METRICS = '/better-display/metrics';
|
|
4
|
+
export const ROUTE_HITS = [ROUTE_REVEAL, ROUTE_SKILL_STATUS, ROUTE_METRICS];
|
|
5
|
+
const hits = new Map(ROUTE_HITS.map(route => [route, 0]));
|
|
6
|
+
const timings = new Map(ROUTE_HITS.map(route => [route, { count: 0, totalMs: 0, maxMs: 0 }]));
|
|
7
|
+
function snapshotHits() {
|
|
8
|
+
return Object.fromEntries(hits);
|
|
9
|
+
}
|
|
10
|
+
function snapshotTimings() {
|
|
11
|
+
return Object.fromEntries([...timings].map(([route, timing]) => [route, { ...timing }]));
|
|
12
|
+
}
|
|
13
|
+
export function recordRouteHit(route) {
|
|
14
|
+
const next = (hits.get(route) ?? 0) + 1;
|
|
15
|
+
hits.set(route, next);
|
|
16
|
+
return next;
|
|
17
|
+
}
|
|
18
|
+
export function recordRouteDuration(route, elapsedMs) {
|
|
19
|
+
const ms = Number.isFinite(elapsedMs) && elapsedMs > 0 ? Math.round(elapsedMs) : 0;
|
|
20
|
+
const current = timings.get(route) ?? { count: 0, totalMs: 0, maxMs: 0 };
|
|
21
|
+
const next = {
|
|
22
|
+
count: current.count + 1,
|
|
23
|
+
totalMs: current.totalMs + ms,
|
|
24
|
+
maxMs: Math.max(current.maxMs, ms),
|
|
25
|
+
};
|
|
26
|
+
timings.set(route, next);
|
|
27
|
+
return next;
|
|
28
|
+
}
|
|
29
|
+
export function metricsPayload() {
|
|
30
|
+
return {
|
|
31
|
+
counters: { dsh_better_display_route_hits_total: snapshotHits() },
|
|
32
|
+
timingsMs: snapshotTimings(),
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=metrics.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../src/metrics.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,wBAAwB,CAAC;AACrD,MAAM,CAAC,MAAM,kBAAkB,GAAG,8BAA8B,CAAC;AACjE,MAAM,CAAC,MAAM,aAAa,GAAG,yBAAyB,CAAC;AAEvD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,YAAY,EAAE,kBAAkB,EAAE,aAAa,CAAU,CAAC;AAQrF,MAAM,IAAI,GAAG,IAAI,GAAG,CAAiB,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;AAC1E,MAAM,OAAO,GAAG,IAAI,GAAG,CAAsB,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAEnH,SAAS,YAAY;IACnB,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,eAAe;IACtB,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC;AAC3F,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAa;IAC1C,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAAa,EAAE,SAAiB;IAClE,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACzE,MAAM,IAAI,GAAG;QACX,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,CAAC;QACxB,OAAO,EAAE,OAAO,CAAC,OAAO,GAAG,EAAE;QAC7B,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;KACnC,CAAC;IACF,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACzB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,cAAc;IAI5B,OAAO;QACL,QAAQ,EAAE,EAAE,mCAAmC,EAAE,YAAY,EAAE,EAAE;QACjE,SAAS,EAAE,eAAe,EAAE;KAC7B,CAAC;AACJ,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dsh-better-display",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.10",
|
|
4
4
|
"description": "A calmer reading view for DeepSeek Harness: native process details, live reasoning, and clean final answers.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"license": "MIT",
|
|
@@ -38,39 +38,61 @@
|
|
|
38
38
|
"test:official": "node scripts/verify-official-bridge.mjs",
|
|
39
39
|
"test:auto-fold": "node scripts/verify-auto-fold.mjs",
|
|
40
40
|
"typecheck": "tsc -p tsconfig.json --noEmit",
|
|
41
|
-
"test": "
|
|
41
|
+
"test": "vitest run",
|
|
42
42
|
"link:harness": "node scripts/link-harness-dependencies.mjs",
|
|
43
|
-
"test:flowcell": "node scripts/verify-flowcell.mjs"
|
|
43
|
+
"test:flowcell": "node scripts/verify-flowcell.mjs",
|
|
44
|
+
"lint": "eslint src --max-warnings 0",
|
|
45
|
+
"format:check": "prettier --check .",
|
|
46
|
+
"deadcode": "knip",
|
|
47
|
+
"duplicates": "jscpd src",
|
|
48
|
+
"debt": "node scripts/check-todo-debt.mjs",
|
|
49
|
+
"changelog": "node scripts/changelog.mjs",
|
|
50
|
+
"check:agents": "node scripts/check-agents-md.mjs",
|
|
51
|
+
"check:bundle": "node scripts/check-bundle-size.mjs",
|
|
52
|
+
"security:audit": "node scripts/security-audit-report.mjs",
|
|
53
|
+
"check:flags": "node scripts/check-dead-flags.mjs",
|
|
54
|
+
"test:list": "vitest list",
|
|
55
|
+
"test:coverage": "vitest run --coverage"
|
|
44
56
|
},
|
|
45
57
|
"peerDependencies": {
|
|
46
58
|
"@deepseek-ai/cordis": "~4.0.4",
|
|
47
|
-
"@deepseek-ai/dsh-api-session-controller": ">=0.2.
|
|
48
|
-
"@deepseek-ai/dsh-attachment": ">=0.2.
|
|
49
|
-
"@deepseek-ai/dsh-client-store": ">=0.2.
|
|
50
|
-
"@deepseek-ai/dsh-client-ui-chat": ">=0.2.
|
|
51
|
-
"@deepseek-ai/dsh-client-ui-conversation": ">=0.2.
|
|
52
|
-
"@deepseek-ai/dsh-client-ui-primitives": ">=0.2.
|
|
53
|
-
"@deepseek-ai/dsh-client-ui-renderer": ">=0.2.
|
|
54
|
-
"@deepseek-ai/dsh-client-ui-session": ">=0.2.
|
|
55
|
-
"@deepseek-ai/dsh-client-ui-slots": ">=0.2.
|
|
56
|
-
"@deepseek-ai/dsh-client-ui-tool": ">=0.2.
|
|
57
|
-
"@deepseek-ai/dsh-session": ">=0.2.
|
|
58
|
-
"@deepseek-ai/dsh-util-workspace-path": ">=0.2.
|
|
59
|
+
"@deepseek-ai/dsh-api-session-controller": ">=0.2.1-rc.1 <0.2.2",
|
|
60
|
+
"@deepseek-ai/dsh-attachment": ">=0.2.1-rc.1 <0.2.2",
|
|
61
|
+
"@deepseek-ai/dsh-client-store": ">=0.2.1-rc.1 <0.2.2",
|
|
62
|
+
"@deepseek-ai/dsh-client-ui-chat": ">=0.2.1-rc.1 <0.2.2",
|
|
63
|
+
"@deepseek-ai/dsh-client-ui-conversation": ">=0.2.1-rc.1 <0.2.2",
|
|
64
|
+
"@deepseek-ai/dsh-client-ui-primitives": ">=0.2.1-rc.1 <0.2.2",
|
|
65
|
+
"@deepseek-ai/dsh-client-ui-renderer": ">=0.2.1-rc.1 <0.2.2",
|
|
66
|
+
"@deepseek-ai/dsh-client-ui-session": ">=0.2.1-rc.1 <0.2.2",
|
|
67
|
+
"@deepseek-ai/dsh-client-ui-slots": ">=0.2.1-rc.1 <0.2.2",
|
|
68
|
+
"@deepseek-ai/dsh-client-ui-tool": ">=0.2.1-rc.1 <0.2.2",
|
|
69
|
+
"@deepseek-ai/dsh-session": ">=0.2.1-rc.1 <0.2.2",
|
|
70
|
+
"@deepseek-ai/dsh-util-workspace-path": ">=0.2.1-rc.1 <0.2.2",
|
|
59
71
|
"react": "^18.2.0"
|
|
60
72
|
},
|
|
61
73
|
"devDependencies": {
|
|
62
|
-
"@deepseek-ai/dsh-api-remotes": "0.2.
|
|
63
|
-
"@deepseek-ai/dsh-api-session-controller": "0.2.
|
|
64
|
-
"@deepseek-ai/dsh-client-connection": "0.2.
|
|
65
|
-
"@deepseek-ai/dsh-session-turn-outline": "0.2.
|
|
74
|
+
"@deepseek-ai/dsh-api-remotes": "0.2.1-rc.5",
|
|
75
|
+
"@deepseek-ai/dsh-api-session-controller": "0.2.1-rc.5",
|
|
76
|
+
"@deepseek-ai/dsh-client-connection": "0.2.1-rc.5",
|
|
77
|
+
"@deepseek-ai/dsh-session-turn-outline": "0.2.1-rc.5",
|
|
66
78
|
"@types/mdast": "^4.0.4",
|
|
67
79
|
"@types/node": "^22.20.0",
|
|
68
80
|
"@types/react": "~18.3.1",
|
|
69
81
|
"lightningcss": "^1.33.0",
|
|
70
|
-
"tsdown": "^0.
|
|
82
|
+
"tsdown": "^0.23.2",
|
|
71
83
|
"tsx": "^4.22.4",
|
|
72
84
|
"typescript": "^6.0.3",
|
|
73
|
-
"semver": "^7.7.2"
|
|
85
|
+
"semver": "^7.7.2",
|
|
86
|
+
"@eslint/js": "^10.0.1",
|
|
87
|
+
"eslint": "^10.13.0",
|
|
88
|
+
"typescript-eslint": "^8.72.0",
|
|
89
|
+
"prettier": "^3.9.10",
|
|
90
|
+
"husky": "^9.1.7",
|
|
91
|
+
"lint-staged": "^17.6.0",
|
|
92
|
+
"knip": "^6.42.1",
|
|
93
|
+
"jscpd": "^5.4.1",
|
|
94
|
+
"@vitest/coverage-v8": "5.0.5",
|
|
95
|
+
"vitest": "5.0.5"
|
|
74
96
|
},
|
|
75
97
|
"dependencies": {
|
|
76
98
|
"clsx": "^2.0.0",
|
|
@@ -109,7 +131,8 @@
|
|
|
109
131
|
"docs"
|
|
110
132
|
],
|
|
111
133
|
"engines": {
|
|
112
|
-
"node": "^22.19.0 || >=24.0.0"
|
|
134
|
+
"node": "^22.19.0 || >=24.0.0",
|
|
135
|
+
"dsh": ">=0.2.1-rc.1 <0.2.2"
|
|
113
136
|
},
|
|
114
137
|
"repository": {
|
|
115
138
|
"type": "git",
|
|
@@ -128,5 +151,14 @@
|
|
|
128
151
|
"reasoning",
|
|
129
152
|
"streaming",
|
|
130
153
|
"accessibility"
|
|
131
|
-
]
|
|
154
|
+
],
|
|
155
|
+
"lint-staged": {
|
|
156
|
+
"*.{ts,tsx}": [
|
|
157
|
+
"eslint --fix",
|
|
158
|
+
"prettier --write"
|
|
159
|
+
],
|
|
160
|
+
"*.{mjs,cjs,js,json,md,yml,yaml,css}": [
|
|
161
|
+
"prettier --write"
|
|
162
|
+
]
|
|
163
|
+
}
|
|
132
164
|
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { execFileSync } from 'node:child_process';
|
|
2
|
+
import { fileURLToPath } from 'node:url';
|
|
3
|
+
|
|
4
|
+
const root = fileURLToPath(new URL('..', import.meta.url));
|
|
5
|
+
const count = process.argv.includes('--self-test') ? '5' : '30';
|
|
6
|
+
const log = execFileSync(
|
|
7
|
+
'git',
|
|
8
|
+
['log', '--no-merges', '-n', count, '--date=short', '--pretty=format:%h %ad %s'],
|
|
9
|
+
{ encoding: 'utf8', cwd: root },
|
|
10
|
+
);
|
|
11
|
+
|
|
12
|
+
console.log('# Notes from git log');
|
|
13
|
+
console.log('');
|
|
14
|
+
console.log('This prints history only. It does not rewrite CHANGELOG.md.');
|
|
15
|
+
console.log('');
|
|
16
|
+
if (!log.trim()) {
|
|
17
|
+
console.log('(no commits)');
|
|
18
|
+
} else {
|
|
19
|
+
for (const line of log.split('\n')) console.log(`- ${line}`);
|
|
20
|
+
}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
import { readFileSync } from 'node:fs';
|
|
2
|
+
import { resolve } from 'node:path';
|
|
3
|
+
|
|
4
|
+
const BUILTINS = new Set([
|
|
5
|
+
'ci', 'install', 'uninstall', 'update', 'outdated', 'ping', 'config', 'cache',
|
|
6
|
+
'explore', 'exec', 'x', 'dlx', 'init', 'create', 'pack', 'publish', 'login',
|
|
7
|
+
'logout', 'whoami', 'view', 'search', 'access', 'audit', 'fund', 'explain',
|
|
8
|
+
'prefix', 'root', 'bin', 'ls', 'version', 'help', 'doctor', 'diff', 'pkg',
|
|
9
|
+
'sbom', 'rebuild', 'link', 'unlink', 'prune', 'dedupe', 'install-test',
|
|
10
|
+
]);
|
|
11
|
+
|
|
12
|
+
/** Script names referenced by fenced npm commands, or null when the command is a builtin. */
|
|
13
|
+
export function npmScriptName(rest) {
|
|
14
|
+
if (rest.startsWith('run ')) {
|
|
15
|
+
const name = rest.slice(4).trim().split(/\s+/)[0];
|
|
16
|
+
return name && !name.startsWith('-') ? name : '';
|
|
17
|
+
}
|
|
18
|
+
const head = rest.split(/\s+/)[0];
|
|
19
|
+
if (head === 'test' || head === 'start') return head;
|
|
20
|
+
if (BUILTINS.has(head)) return null;
|
|
21
|
+
return '';
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export function missingNpmScripts(markdown, scriptNames) {
|
|
25
|
+
const missing = new Set();
|
|
26
|
+
for (const match of markdown.matchAll(/```[^\n]*\n([\s\S]*?)```/g)) {
|
|
27
|
+
for (const rawLine of match[1].split('\n')) {
|
|
28
|
+
for (const piece of rawLine.split(/&&|\|\||;/)) {
|
|
29
|
+
let command = piece.trim().replace(/^(?:[A-Za-z_][A-Za-z0-9_]*=\S*\s+)+/, '');
|
|
30
|
+
if (command.startsWith('$ ')) command = command.slice(2).trim();
|
|
31
|
+
if (!command.startsWith('npm ') && command !== 'npm') continue;
|
|
32
|
+
const name = npmScriptName(command.slice(3).trim());
|
|
33
|
+
if (name === null) continue;
|
|
34
|
+
if (!name || !scriptNames.has(name)) missing.add(name || command);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return [...missing];
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
function selfTest() {
|
|
42
|
+
const scripts = new Set(['build', 'test', 'typecheck']);
|
|
43
|
+
const ok = missingNpmScripts('```sh\nnpm ci\nnpm run build\nnpm test\n```\n', scripts);
|
|
44
|
+
const bad = missingNpmScripts('```sh\nnpm run nope\n```\nSee `npm run nope` outside.\n', scripts);
|
|
45
|
+
const unfenced = missingNpmScripts('Run npm run nope in prose.\n', scripts);
|
|
46
|
+
if (ok.length !== 0 || bad.join() !== 'nope' || unfenced.length !== 0) {
|
|
47
|
+
console.error('check-agents-md self-test failed', { ok, bad, unfenced });
|
|
48
|
+
process.exit(1);
|
|
49
|
+
}
|
|
50
|
+
console.log('check-agents-md self-test passed');
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
if (process.argv.includes('--self-test')) selfTest();
|
|
54
|
+
|
|
55
|
+
const root = resolve(import.meta.dirname, '..');
|
|
56
|
+
const markdown = readFileSync(resolve(root, 'AGENTS.md'), 'utf8');
|
|
57
|
+
if (!markdown.trim()) {
|
|
58
|
+
console.error('AGENTS.md is empty');
|
|
59
|
+
process.exit(1);
|
|
60
|
+
}
|
|
61
|
+
const pkg = JSON.parse(readFileSync(resolve(root, 'package.json'), 'utf8'));
|
|
62
|
+
const missing = missingNpmScripts(markdown, new Set(Object.keys(pkg.scripts ?? {})));
|
|
63
|
+
if (missing.length > 0) {
|
|
64
|
+
console.error(`AGENTS.md fenced npm commands are not package.json scripts: ${missing.join(', ')}`);
|
|
65
|
+
process.exit(1);
|
|
66
|
+
}
|
|
67
|
+
console.log('AGENTS.md fenced npm commands match package.json scripts');
|