@phren/cli 0.1.44 → 0.1.45
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/cli/actions.d.ts +1 -1
- package/dist/cli/actions.js +7 -2
- package/dist/cli/config-proactivity.d.ts +6 -6
- package/dist/cli/hooks.d.ts +1 -1
- package/dist/cli/hooks.js +14 -3
- package/dist/cli/session-stop.d.ts +1 -1
- package/dist/cli/session-tool-hook.d.ts +1 -1
- package/dist/cli-registry.js +1 -1
- package/dist/data/access.js +2 -1
- package/dist/generated/memory-ui-graph.browser.js +481 -318
- package/dist/governance/locks.js +6 -0
- package/dist/graph-core/index.d.ts +2 -0
- package/dist/graph-core/index.js +2 -0
- package/dist/graph-core/model.d.ts +84 -0
- package/dist/graph-core/model.js +355 -0
- package/dist/graph-core/types.d.ts +110 -0
- package/dist/graph-core/types.js +43 -0
- package/dist/index.js +4 -1
- package/dist/init/init-uninstall.d.ts +1 -0
- package/dist/init/init-uninstall.js +1 -1
- package/dist/init/setup.js +11 -4
- package/dist/link/context.js +2 -1
- package/dist/link/link.js +3 -2
- package/dist/link/skills.js +2 -1
- package/dist/memory-ui-graph.runtime.js +481 -318
- package/dist/phren-core.d.ts +16 -0
- package/dist/phren-core.js +21 -0
- package/dist/phren-paths.js +8 -4
- package/dist/profile-store.js +3 -2
- package/dist/project-config.js +2 -1
- package/dist/shared/index.js +1 -1
- package/dist/shared/retrieval.d.ts +28 -0
- package/dist/shared/retrieval.js +45 -0
- package/dist/shell/entry.d.ts +3 -3
- package/dist/shell/entry.js +19 -44
- package/dist/shell/graph/canvas.d.ts +64 -0
- package/dist/shell/graph/canvas.js +256 -0
- package/dist/shell/graph/controller.d.ts +164 -0
- package/dist/shell/graph/controller.js +645 -0
- package/dist/shell/graph/glyphs.d.ts +12 -0
- package/dist/shell/graph/glyphs.js +31 -0
- package/dist/shell/graph/graph-view.d.ts +12 -0
- package/dist/shell/graph/graph-view.js +408 -0
- package/dist/shell/graph/layout.d.ts +68 -0
- package/dist/shell/graph/layout.js +267 -0
- package/dist/shell/input.d.ts +3 -0
- package/dist/shell/input.js +24 -4
- package/dist/shell/intro.d.ts +37 -0
- package/dist/shell/intro.js +82 -0
- package/dist/shell/logo-fx.d.ts +35 -0
- package/dist/shell/logo-fx.js +128 -0
- package/dist/shell/render.d.ts +2 -2
- package/dist/shell/render.js +12 -28
- package/dist/shell/shell.d.ts +13 -1
- package/dist/shell/shell.js +45 -7
- package/dist/shell/startup.d.ts +37 -0
- package/dist/shell/startup.js +105 -0
- package/dist/shell/state-store.d.ts +1 -1
- package/dist/shell/state-store.js +1 -1
- package/dist/shell/types.js +1 -0
- package/dist/shell/view.d.ts +3 -0
- package/dist/shell/view.js +24 -3
- package/dist/store-registry.js +3 -3
- package/dist/test-global-setup.d.ts +1 -0
- package/dist/test-global-setup.js +22 -0
- package/dist/tool-registry.js +1 -0
- package/dist/ui/data.d.ts +15 -7
- package/dist/ui/data.js +102 -3
- package/dist/utils-fts.js +2 -1
- package/dist/utils-helpers.d.ts +1 -0
- package/dist/utils-helpers.js +6 -0
- package/dist/utils.d.ts +1 -1
- package/dist/utils.js +1 -1
- package/package.json +11 -7
package/dist/phren-core.d.ts
CHANGED
|
@@ -48,6 +48,22 @@ export declare function phrenErr<T>(error: string, code?: PhrenErrorCode): Phren
|
|
|
48
48
|
export declare function forwardErr<T>(result: PhrenResult<unknown>): PhrenResult<T>;
|
|
49
49
|
export declare function parsePhrenErrorCode(msg: string): PhrenErrorCode | undefined;
|
|
50
50
|
export declare function isRecord(value: unknown): value is Record<string, unknown>;
|
|
51
|
+
/**
|
|
52
|
+
* `yaml.load` with js-yaml 4's empty-document behaviour.
|
|
53
|
+
*
|
|
54
|
+
* js-yaml 5 throws YAMLException("expected a document, but the input is empty")
|
|
55
|
+
* for input that is blank, whitespace, or comments only — where 4 returned
|
|
56
|
+
* `undefined`. phren's config files legitimately look like that: a freshly
|
|
57
|
+
* scaffolded `machines.yaml` is a single header comment, and an untouched
|
|
58
|
+
* profile can be empty. Every caller already handles `undefined`, but a throw
|
|
59
|
+
* is read as a parse failure, which would report those files as malformed —
|
|
60
|
+
* and `stores.yaml` refuses to write back over a file it could not parse, so
|
|
61
|
+
* an empty registry would have become unrepairable by the CLI.
|
|
62
|
+
*
|
|
63
|
+
* Only genuinely empty documents are absorbed. `---`, `null` and real syntax
|
|
64
|
+
* errors reach js-yaml exactly as before.
|
|
65
|
+
*/
|
|
66
|
+
export declare function loadYamlDocument<T = unknown>(source: string, load: (source: string) => unknown): T | undefined;
|
|
51
67
|
/** Shallow-merge data onto defaults so missing keys get filled in. */
|
|
52
68
|
export declare function withDefaults<T extends object>(data: Partial<T>, defaults: T): T;
|
|
53
69
|
/**
|
package/dist/phren-core.js
CHANGED
|
@@ -70,6 +70,27 @@ export function parsePhrenErrorCode(msg) {
|
|
|
70
70
|
export function isRecord(value) {
|
|
71
71
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
72
72
|
}
|
|
73
|
+
/**
|
|
74
|
+
* `yaml.load` with js-yaml 4's empty-document behaviour.
|
|
75
|
+
*
|
|
76
|
+
* js-yaml 5 throws YAMLException("expected a document, but the input is empty")
|
|
77
|
+
* for input that is blank, whitespace, or comments only — where 4 returned
|
|
78
|
+
* `undefined`. phren's config files legitimately look like that: a freshly
|
|
79
|
+
* scaffolded `machines.yaml` is a single header comment, and an untouched
|
|
80
|
+
* profile can be empty. Every caller already handles `undefined`, but a throw
|
|
81
|
+
* is read as a parse failure, which would report those files as malformed —
|
|
82
|
+
* and `stores.yaml` refuses to write back over a file it could not parse, so
|
|
83
|
+
* an empty registry would have become unrepairable by the CLI.
|
|
84
|
+
*
|
|
85
|
+
* Only genuinely empty documents are absorbed. `---`, `null` and real syntax
|
|
86
|
+
* errors reach js-yaml exactly as before.
|
|
87
|
+
*/
|
|
88
|
+
export function loadYamlDocument(source, load) {
|
|
89
|
+
// Strip blank and comment-only lines; anything left is a document to parse.
|
|
90
|
+
if (!source.replace(/^\s*(#.*)?$/gm, "").trim())
|
|
91
|
+
return undefined;
|
|
92
|
+
return load(source);
|
|
93
|
+
}
|
|
73
94
|
/** Shallow-merge data onto defaults so missing keys get filled in. */
|
|
74
95
|
export function withDefaults(data, defaults) {
|
|
75
96
|
const merged = { ...defaults };
|
package/dist/phren-paths.js
CHANGED
|
@@ -4,7 +4,7 @@ import * as path from "path";
|
|
|
4
4
|
import * as crypto from "crypto";
|
|
5
5
|
import * as yaml from "js-yaml";
|
|
6
6
|
import { bootstrapPhrenDotEnv } from "./phren-dotenv.js";
|
|
7
|
-
import { PhrenError, isRecord, RESERVED_PROJECT_DIR_NAMES } from "./phren-core.js";
|
|
7
|
+
import { PhrenError, isRecord, loadYamlDocument, RESERVED_PROJECT_DIR_NAMES } from "./phren-core.js";
|
|
8
8
|
import { errorMessage, isValidProjectName, safeProjectPath } from "./utils.js";
|
|
9
9
|
import { FINDINGS_FILENAME } from "./data/access.js";
|
|
10
10
|
bootstrapPhrenDotEnv();
|
|
@@ -128,7 +128,7 @@ export function readRootManifest(phrenPath) {
|
|
|
128
128
|
if (!fs.existsSync(manifestFile))
|
|
129
129
|
return null;
|
|
130
130
|
try {
|
|
131
|
-
const parsed =
|
|
131
|
+
const parsed = loadYamlDocument(fs.readFileSync(manifestFile, "utf8"), (text) => yaml.load(text, { schema: yaml.CORE_SCHEMA }));
|
|
132
132
|
return normalizeManifest(parsed);
|
|
133
133
|
}
|
|
134
134
|
catch (err) {
|
|
@@ -176,7 +176,11 @@ export function findNearestPhrenPath(startDir = process.cwd()) {
|
|
|
176
176
|
let current = path.resolve(startDir);
|
|
177
177
|
while (true) {
|
|
178
178
|
const localCandidate = path.join(current, ".phren");
|
|
179
|
-
|
|
179
|
+
// Only a manifest counts on the cwd walk. Loose install markers are
|
|
180
|
+
// enough for the user's own ~/.phren or an explicit PHREN_PATH, but a
|
|
181
|
+
// cloned repo could ship `.phren/global/` and become the store — with
|
|
182
|
+
// its `.env` loaded — just by being cd'd into.
|
|
183
|
+
if (hasRootManifest(localCandidate))
|
|
180
184
|
return localCandidate;
|
|
181
185
|
const parent = path.dirname(current);
|
|
182
186
|
if (parent === current)
|
|
@@ -578,7 +582,7 @@ export function getProjectDirs(phrenPath, profile) {
|
|
|
578
582
|
return [];
|
|
579
583
|
}
|
|
580
584
|
try {
|
|
581
|
-
const data =
|
|
585
|
+
const data = loadYamlDocument(fs.readFileSync(profilePath, "utf-8"), (text) => yaml.load(text, { schema: yaml.CORE_SCHEMA }));
|
|
582
586
|
const projects = isRecord(data) ? data.projects : undefined;
|
|
583
587
|
if (!Array.isArray(projects)) {
|
|
584
588
|
errorLog("getProjectDirs", `${PhrenError.MALFORMED_YAML}: Profile YAML missing valid "projects" array: ${profilePath}`);
|
package/dist/profile-store.js
CHANGED
|
@@ -2,6 +2,7 @@ import * as fs from "fs";
|
|
|
2
2
|
import * as path from "path";
|
|
3
3
|
import * as crypto from "crypto";
|
|
4
4
|
import * as yaml from "js-yaml";
|
|
5
|
+
import { loadYamlDocument } from "./phren-core.js";
|
|
5
6
|
import { phrenErr, PhrenError, phrenOk, forwardErr, getProjectDirs, readRootManifest, } from "./shared.js";
|
|
6
7
|
import { defaultMachineName, getMachineName } from "./machine-identity.js";
|
|
7
8
|
import { errorMessage, isValidProjectName } from "./utils.js";
|
|
@@ -54,7 +55,7 @@ export function listMachines(phrenPath) {
|
|
|
54
55
|
return phrenErr(`machines.yaml not found. Run 'phren init' to set up your phren.`, PhrenError.FILE_NOT_FOUND);
|
|
55
56
|
try {
|
|
56
57
|
const raw = fs.readFileSync(machinesPath, "utf8");
|
|
57
|
-
const parsed = yaml.load(
|
|
58
|
+
const parsed = loadYamlDocument(raw, (text) => yaml.load(text, { schema: yaml.CORE_SCHEMA }));
|
|
58
59
|
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
|
|
59
60
|
return phrenErr(`machines.yaml is empty or not valid YAML. Check the file format or run 'phren doctor --fix'.`, PhrenError.MALFORMED_YAML);
|
|
60
61
|
const cleaned = {};
|
|
@@ -214,7 +215,7 @@ export function listProfiles(phrenPath) {
|
|
|
214
215
|
const full = path.join(profilesDir, file);
|
|
215
216
|
try {
|
|
216
217
|
const raw = fs.readFileSync(full, "utf8");
|
|
217
|
-
const parsed = yaml.load(
|
|
218
|
+
const parsed = loadYamlDocument(raw, (text) => yaml.load(text, { schema: yaml.CORE_SCHEMA }));
|
|
218
219
|
const data = parsed && typeof parsed === "object" && !Array.isArray(parsed)
|
|
219
220
|
? parsed
|
|
220
221
|
: null;
|
package/dist/project-config.js
CHANGED
|
@@ -2,6 +2,7 @@ import * as crypto from "crypto";
|
|
|
2
2
|
import * as fs from "fs";
|
|
3
3
|
import * as path from "path";
|
|
4
4
|
import * as yaml from "js-yaml";
|
|
5
|
+
import { loadYamlDocument } from "./phren-core.js";
|
|
5
6
|
import { readInstallPreferences } from "./init/preferences.js";
|
|
6
7
|
import { debugLog } from "./shared.js";
|
|
7
8
|
import { errorMessage } from "./utils.js";
|
|
@@ -63,7 +64,7 @@ export function readProjectConfig(phrenPath, project) {
|
|
|
63
64
|
return cached.config;
|
|
64
65
|
}
|
|
65
66
|
try {
|
|
66
|
-
const parsed =
|
|
67
|
+
const parsed = loadYamlDocument(fs.readFileSync(configPath, "utf8"), (text) => yaml.load(text, { schema: yaml.CORE_SCHEMA }));
|
|
67
68
|
const config = parsed && typeof parsed === "object" && !Array.isArray(parsed) ? parsed : {};
|
|
68
69
|
_projectConfigCache.set(configPath, { mtimeMs, config });
|
|
69
70
|
return config;
|
package/dist/shared/index.js
CHANGED
|
@@ -671,7 +671,7 @@ function endTopicBuildCache() {
|
|
|
671
671
|
function readProjectTopicsForBuild(phrenPath, project) {
|
|
672
672
|
if (!_buildTopicCacheActive)
|
|
673
673
|
return readProjectTopics(phrenPath, project);
|
|
674
|
-
const key = `${phrenPath}
|
|
674
|
+
const key = `${phrenPath}\u0000${project}`;
|
|
675
675
|
const hit = _buildTopicCache.get(key);
|
|
676
676
|
if (hit)
|
|
677
677
|
return hit;
|
|
@@ -12,6 +12,13 @@ export type { GitContext } from "../cli/hooks-session.js";
|
|
|
12
12
|
* middle snippet that legitimately fit.
|
|
13
13
|
*/
|
|
14
14
|
export declare const SNIPPET_OVERHEAD_TOKENS = 24;
|
|
15
|
+
/** Query-relevance floor (see applyRelevanceFloor). A doc with no structural
|
|
16
|
+
* signal must clear this query-overlap score to be worth injecting; on the
|
|
17
|
+
* overlapScore scale (matched / max(2, min(tokens, 10))) ~0.12 means "shares at
|
|
18
|
+
* least one query token" — enough to drop priors-only noise without hurting
|
|
19
|
+
* recall. Cross-project docs face a higher bar. Tunable via
|
|
20
|
+
* PHREN_MIN_QUERY_RELEVANCE (0 disables the floor). */
|
|
21
|
+
declare const DEFAULT_MIN_QUERY_RELEVANCE = 0.12;
|
|
15
22
|
export declare function detectTaskIntent(prompt: string): "debug" | "review" | "build" | "docs" | "skill" | "general";
|
|
16
23
|
export declare function fileRelevanceBoost(filePath: string, changedFiles: Set<string>): number;
|
|
17
24
|
export declare function branchMatchBoost(content: string, branch: string | undefined): number;
|
|
@@ -108,6 +115,27 @@ export interface SelectedSnippet {
|
|
|
108
115
|
/** Mark snippet lines with stale citations (cited file missing or line content changed).
|
|
109
116
|
* @internal Exported for tests. */
|
|
110
117
|
export declare function markStaleCitations(snippet: string): string;
|
|
118
|
+
export { DEFAULT_MIN_QUERY_RELEVANCE };
|
|
119
|
+
/**
|
|
120
|
+
* Relevance floor: drop ranked docs that aren't actually relevant to *this*
|
|
121
|
+
* prompt, so the hook injects signal or nothing — never noise to fill a quota.
|
|
122
|
+
*
|
|
123
|
+
* `rankResults` intentionally scores on priors too (intent, recency, project,
|
|
124
|
+
* feedback history), so a doc can rank well with zero query overlap. That's the
|
|
125
|
+
* right call for *ordering*, but the wrong thing to *inject*. This stage keeps a
|
|
126
|
+
* doc only when it has a real connection to the prompt:
|
|
127
|
+
* - a structural signal: it's a changed file, or matches the branch name, or
|
|
128
|
+
* - it's a canonical doc for the project you're actually in, or
|
|
129
|
+
* - its text clears a query-overlap floor (higher for cross-project docs).
|
|
130
|
+
*
|
|
131
|
+
* When there's no usable query signal (no tokens) it is a no-op. Setting the
|
|
132
|
+
* floor to 0 (env PHREN_MIN_QUERY_RELEVANCE=0) disables it and restores the
|
|
133
|
+
* previous always-fill behavior.
|
|
134
|
+
*/
|
|
135
|
+
export declare function applyRelevanceFloor(rows: DocRow[], keywords: string, gitCtx: {
|
|
136
|
+
branch?: string;
|
|
137
|
+
changedFiles?: Set<string>;
|
|
138
|
+
} | null, detectedProject: string | null, floor?: number): DocRow[];
|
|
111
139
|
export declare function selectSnippets(rows: DocRow[], keywords: string, tokenBudget: number, lineBudget: number, charBudget: number): {
|
|
112
140
|
selected: SelectedSnippet[];
|
|
113
141
|
usedTokens: number;
|
package/dist/shared/retrieval.js
CHANGED
|
@@ -39,6 +39,14 @@ const VERY_LOW_FOCUS_SNIPPET_SCORE = 0.14;
|
|
|
39
39
|
export const SNIPPET_OVERHEAD_TOKENS = 24;
|
|
40
40
|
const LOW_FOCUS_SNIPPET_LINE_CAP = 3;
|
|
41
41
|
const LOW_FOCUS_SNIPPET_CHAR_FRACTION = 0.55;
|
|
42
|
+
/** Query-relevance floor (see applyRelevanceFloor). A doc with no structural
|
|
43
|
+
* signal must clear this query-overlap score to be worth injecting; on the
|
|
44
|
+
* overlapScore scale (matched / max(2, min(tokens, 10))) ~0.12 means "shares at
|
|
45
|
+
* least one query token" — enough to drop priors-only noise without hurting
|
|
46
|
+
* recall. Cross-project docs face a higher bar. Tunable via
|
|
47
|
+
* PHREN_MIN_QUERY_RELEVANCE (0 disables the floor). */
|
|
48
|
+
const DEFAULT_MIN_QUERY_RELEVANCE = 0.12;
|
|
49
|
+
const CROSS_PROJECT_MIN_QUERY_RELEVANCE = 0.25;
|
|
42
50
|
const TASK_RESCUE_MIN_OVERLAP = 0.3;
|
|
43
51
|
const TASK_RESCUE_OVERLAP_MARGIN = 0.12;
|
|
44
52
|
const TASK_RESCUE_SCORE_MARGIN = 0.6;
|
|
@@ -854,6 +862,43 @@ export function markStaleCitations(snippet) {
|
|
|
854
862
|
}
|
|
855
863
|
return result.join("\n");
|
|
856
864
|
}
|
|
865
|
+
export { DEFAULT_MIN_QUERY_RELEVANCE };
|
|
866
|
+
/**
|
|
867
|
+
* Relevance floor: drop ranked docs that aren't actually relevant to *this*
|
|
868
|
+
* prompt, so the hook injects signal or nothing — never noise to fill a quota.
|
|
869
|
+
*
|
|
870
|
+
* `rankResults` intentionally scores on priors too (intent, recency, project,
|
|
871
|
+
* feedback history), so a doc can rank well with zero query overlap. That's the
|
|
872
|
+
* right call for *ordering*, but the wrong thing to *inject*. This stage keeps a
|
|
873
|
+
* doc only when it has a real connection to the prompt:
|
|
874
|
+
* - a structural signal: it's a changed file, or matches the branch name, or
|
|
875
|
+
* - it's a canonical doc for the project you're actually in, or
|
|
876
|
+
* - its text clears a query-overlap floor (higher for cross-project docs).
|
|
877
|
+
*
|
|
878
|
+
* When there's no usable query signal (no tokens) it is a no-op. Setting the
|
|
879
|
+
* floor to 0 (env PHREN_MIN_QUERY_RELEVANCE=0) disables it and restores the
|
|
880
|
+
* previous always-fill behavior.
|
|
881
|
+
*/
|
|
882
|
+
export function applyRelevanceFloor(rows, keywords, gitCtx, detectedProject, floor = DEFAULT_MIN_QUERY_RELEVANCE) {
|
|
883
|
+
if (!(floor > 0))
|
|
884
|
+
return rows;
|
|
885
|
+
const queryTokens = tokenizeForOverlap(keywords);
|
|
886
|
+
if (!queryTokens.length)
|
|
887
|
+
return rows; // no query signal to judge against
|
|
888
|
+
const changedFiles = gitCtx?.changedFiles ?? new Set();
|
|
889
|
+
const branch = gitCtx?.branch;
|
|
890
|
+
const crossFloor = Math.max(floor, CROSS_PROJECT_MIN_QUERY_RELEVANCE);
|
|
891
|
+
return rows.filter((doc) => {
|
|
892
|
+
if (fileRelevanceBoost(doc.path, changedFiles) > 0)
|
|
893
|
+
return true;
|
|
894
|
+
if (branchMatchBoost(doc.content, branch) > 0)
|
|
895
|
+
return true;
|
|
896
|
+
if (detectedProject && doc.project === detectedProject && doc.type === "canonical")
|
|
897
|
+
return true;
|
|
898
|
+
const isCrossProject = Boolean(detectedProject) && doc.project !== detectedProject;
|
|
899
|
+
return docOverlapScore(queryTokens, doc) >= (isCrossProject ? crossFloor : floor);
|
|
900
|
+
});
|
|
901
|
+
}
|
|
857
902
|
export function selectSnippets(rows, keywords, tokenBudget, lineBudget, charBudget) {
|
|
858
903
|
const selected = [];
|
|
859
904
|
let usedTokens = 36;
|
package/dist/shell/entry.d.ts
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
* Shell entry point: wires PhrenShell to stdin/stdout.
|
|
3
3
|
* Extracted from shell.ts to keep the orchestrator under 300 lines.
|
|
4
4
|
*/
|
|
5
|
+
import type { ShellStartup } from "./startup.js";
|
|
5
6
|
interface LiveStateHost {
|
|
6
7
|
invalidateSubsectionsCache(): void;
|
|
7
8
|
setMessage(message: string): void;
|
|
@@ -20,7 +21,7 @@ interface StartupIntroPlan {
|
|
|
20
21
|
* animation frames raced the first dashboard repaint. Key delivery is now owned
|
|
21
22
|
* by startShell, which hands the intro a one-shot waiter that consumes the key.
|
|
22
23
|
*/
|
|
23
|
-
export type KeypressWaiter
|
|
24
|
+
export type { KeypressWaiter } from "./intro.js";
|
|
24
25
|
export declare function resolveStartupIntroPlan(phrenPath: string, version?: string): StartupIntroPlan;
|
|
25
26
|
export declare function startLiveStatePoller({ phrenPath, shell, repaint, isExiting, intervalMs, computeToken, }: {
|
|
26
27
|
phrenPath: string;
|
|
@@ -30,5 +31,4 @@ export declare function startLiveStatePoller({ phrenPath, shell, repaint, isExit
|
|
|
30
31
|
intervalMs?: number;
|
|
31
32
|
computeToken?: (phrenPath: string) => string;
|
|
32
33
|
}): () => void;
|
|
33
|
-
export declare function startShell(phrenPath: string, profile: string): Promise<void>;
|
|
34
|
-
export {};
|
|
34
|
+
export declare function startShell(phrenPath: string, profile: string, startup?: ShellStartup): Promise<void>;
|
package/dist/shell/entry.js
CHANGED
|
@@ -3,20 +3,14 @@
|
|
|
3
3
|
* Extracted from shell.ts to keep the orchestrator under 300 lines.
|
|
4
4
|
*/
|
|
5
5
|
import { PhrenShell } from "./shell.js";
|
|
6
|
-
import { style, clearScreen, paintFrame, enterFullscreen, exitFullscreen,
|
|
6
|
+
import { style, clearScreen, paintFrame, enterFullscreen, exitFullscreen, } from "./render.js";
|
|
7
7
|
import { KeyDecoder, ESC_FLUSH_MS } from "./keys.js";
|
|
8
|
-
import {
|
|
8
|
+
import { playSplash } from "./intro.js";
|
|
9
9
|
import { errorMessage } from "../utils.js";
|
|
10
10
|
import { computePhrenLiveStateToken } from "../shared.js";
|
|
11
11
|
import { VERSION } from "../init/shared.js";
|
|
12
12
|
import { loadShellState, saveShellState } from "./state-store.js";
|
|
13
13
|
const LIVE_STATE_POLL_MS = 2000;
|
|
14
|
-
function renderIntroFrame(lines) {
|
|
15
|
-
paintFrame(fitFrame(lines));
|
|
16
|
-
}
|
|
17
|
-
function sleep(ms) {
|
|
18
|
-
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
19
|
-
}
|
|
20
14
|
const noopWaiter = () => Promise.resolve();
|
|
21
15
|
export function resolveStartupIntroPlan(phrenPath, version = VERSION) {
|
|
22
16
|
const state = loadShellState(phrenPath);
|
|
@@ -41,40 +35,17 @@ function markStartupIntroSeen(phrenPath, version = VERSION) {
|
|
|
41
35
|
async function playStartupIntro(phrenPath, plan = resolveStartupIntroPlan(phrenPath), waitForAnyKeypress = noopWaiter) {
|
|
42
36
|
if (!process.stdout.isTTY || plan.variant === "skip")
|
|
43
37
|
return;
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
const animator = createPhrenAnimator({ facing: "right" });
|
|
56
|
-
animator.start();
|
|
57
|
-
function renderAnimatedFrame(hint) {
|
|
58
|
-
renderIntroFrame(composeStartupFrame(animator.getFrame(), VERSION, hint));
|
|
59
|
-
}
|
|
60
|
-
// Animate during dwell/loading period
|
|
61
|
-
if (plan.holdForKeypress) {
|
|
62
|
-
const animInterval = setInterval(() => renderAnimatedFrame(renderHint), 200);
|
|
63
|
-
renderAnimatedFrame(renderHint);
|
|
64
|
-
await waitForAnyKeypress();
|
|
65
|
-
clearInterval(animInterval);
|
|
66
|
-
}
|
|
67
|
-
else if (plan.dwellMs > 0) {
|
|
68
|
-
const startTime = Date.now();
|
|
69
|
-
while (Date.now() - startTime < plan.dwellMs) {
|
|
70
|
-
renderAnimatedFrame(renderHint);
|
|
71
|
-
await sleep(200);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
else {
|
|
75
|
-
renderAnimatedFrame(renderHint);
|
|
76
|
-
}
|
|
77
|
-
animator.stop();
|
|
38
|
+
// The shell is already on the alternate screen; the splash paints in place.
|
|
39
|
+
// A full intro plays the wordmark reveal, a repeat launch opens on the
|
|
40
|
+
// finished wordmark, and either way the shimmer runs until dismissed.
|
|
41
|
+
await playSplash({
|
|
42
|
+
version: VERSION,
|
|
43
|
+
hint: plan.holdForKeypress ? "Press any key to enter" : "Loading shell…",
|
|
44
|
+
reveal: plan.variant === "full",
|
|
45
|
+
dwellMs: plan.dwellMs,
|
|
46
|
+
waitForKeypress: plan.holdForKeypress ? waitForAnyKeypress : undefined,
|
|
47
|
+
fullscreen: false,
|
|
48
|
+
});
|
|
78
49
|
if (plan.markSeen) {
|
|
79
50
|
markStartupIntroSeen(phrenPath);
|
|
80
51
|
}
|
|
@@ -109,8 +80,8 @@ export function startLiveStatePoller({ phrenPath, shell, repaint, isExiting = ()
|
|
|
109
80
|
clearInterval(poll);
|
|
110
81
|
};
|
|
111
82
|
}
|
|
112
|
-
export async function startShell(phrenPath, profile) {
|
|
113
|
-
const shell = new PhrenShell(phrenPath, profile);
|
|
83
|
+
export async function startShell(phrenPath, profile, startup = {}) {
|
|
84
|
+
const shell = new PhrenShell(phrenPath, profile, undefined, startup);
|
|
114
85
|
if (!process.stdin.isTTY) {
|
|
115
86
|
const { createInterface } = await import("readline");
|
|
116
87
|
const rl = createInterface({ input: process.stdin, output: process.stdout, terminal: process.stdin.isTTY ?? false });
|
|
@@ -169,6 +140,10 @@ export async function startShell(phrenPath, profile) {
|
|
|
169
140
|
painting = false;
|
|
170
141
|
}
|
|
171
142
|
};
|
|
143
|
+
// The graph view animates (layout settle, fly-to) and finishes builds off
|
|
144
|
+
// the key path; give the shell a way to repaint without a keypress.
|
|
145
|
+
shell.setRepaintHandler(() => { if (!exiting && !introActive)
|
|
146
|
+
void repaint(); });
|
|
172
147
|
let done;
|
|
173
148
|
const exitPromise = new Promise((resolve) => { done = resolve; });
|
|
174
149
|
const restoreTerminal = () => {
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A braille dot canvas with a text overlay, rendered to ANSI lines.
|
|
3
|
+
*
|
|
4
|
+
* Each terminal cell is a 2×4 grid of braille dots (U+2800–U+28FF), which
|
|
5
|
+
* gives the graph 8× the resolution of plain block characters and — because
|
|
6
|
+
* a cell is roughly twice as tall as it is wide — dots that are close to
|
|
7
|
+
* square, so no aspect correction is needed. Edges and node blobs are drawn
|
|
8
|
+
* in dot space; glyphs, labels and the legend are written into a cell-level
|
|
9
|
+
* overlay that takes precedence when rendering.
|
|
10
|
+
*
|
|
11
|
+
* Every rendered line is exactly `cols` cells wide and built only from
|
|
12
|
+
* width-1 characters, so the shell's `truncateLine`/`displayWidth` pipeline
|
|
13
|
+
* measures it correctly.
|
|
14
|
+
*/
|
|
15
|
+
export type ColorMode = "truecolor" | "256";
|
|
16
|
+
/** Tests pin the mode; real terminals are sniffed from COLORTERM/TERM. */
|
|
17
|
+
export declare function setColorMode(mode: ColorMode | null): void;
|
|
18
|
+
export declare function colorMode(): ColorMode;
|
|
19
|
+
export declare function hexToRgb(hex: string): [number, number, number];
|
|
20
|
+
export declare function rgbToHex(r: number, g: number, b: number): string;
|
|
21
|
+
/** Linear blend from `from` toward `to` by `t` in [0, 1]. */
|
|
22
|
+
export declare function blendHex(from: string, to: string, t: number): string;
|
|
23
|
+
/** Nearest xterm-256 index: 6×6×6 colour cube, or the grey ramp for greys. */
|
|
24
|
+
export declare function hexToAnsi256(hex: string): number;
|
|
25
|
+
/** Foreground SGR for a hex colour in the active colour mode. */
|
|
26
|
+
export declare function hexToSgr(hex: string): string;
|
|
27
|
+
export interface DotOptions {
|
|
28
|
+
/** Higher z wins when two draws hit the same cell (node dots beat edges). */
|
|
29
|
+
z?: number;
|
|
30
|
+
/** Light every other dot along a line. */
|
|
31
|
+
dotted?: boolean;
|
|
32
|
+
}
|
|
33
|
+
export declare class BrailleCanvas {
|
|
34
|
+
readonly cols: number;
|
|
35
|
+
readonly rows: number;
|
|
36
|
+
private readonly masks;
|
|
37
|
+
private readonly zs;
|
|
38
|
+
private readonly colors;
|
|
39
|
+
private readonly overlay;
|
|
40
|
+
constructor(cols: number, rows: number);
|
|
41
|
+
get dotWidth(): number;
|
|
42
|
+
get dotHeight(): number;
|
|
43
|
+
private cell;
|
|
44
|
+
setDot(x: number, y: number, color: string, z?: number): void;
|
|
45
|
+
/** Bresenham in dot space. */
|
|
46
|
+
line(x0: number, y0: number, x1: number, y1: number, color: string, opts?: DotOptions): void;
|
|
47
|
+
/** Filled disc in dot space; radius 0 lights a single dot. */
|
|
48
|
+
disc(cx: number, cy: number, radius: number, color: string, z?: number): void;
|
|
49
|
+
/**
|
|
50
|
+
* True when the cells [col, col+width) on `row` hold no overlay text —
|
|
51
|
+
* and, with `avoidDots`, no braille dots either, so a label does not
|
|
52
|
+
* paint over somebody else's node or edge.
|
|
53
|
+
*/
|
|
54
|
+
isFree(col: number, row: number, width: number, avoidDots?: boolean): boolean;
|
|
55
|
+
/**
|
|
56
|
+
* Write styled text into the overlay. Characters wider than one cell are
|
|
57
|
+
* replaced with `·` so the row stays exactly `cols` wide. Returns the number
|
|
58
|
+
* of cells written (0 when the text starts off-canvas).
|
|
59
|
+
*/
|
|
60
|
+
putText(col: number, row: number, text: string, sgr?: string): number;
|
|
61
|
+
/** Every cell in a rectangle is overlaid with a space, hiding dots underneath (pane backdrop). */
|
|
62
|
+
clearRect(col: number, row: number, width: number, height: number): void;
|
|
63
|
+
render(): string[];
|
|
64
|
+
}
|