@xortex/xcode 3.1.1 → 3.1.2
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/bin/xcode +1 -1
- package/costHook.ts +22 -0
- package/dialogLaunchers.tsx +133 -0
- package/entrypoints/cli.tsx +1 -1
- package/macro.ts +1 -1
- package/package.json +6 -2
- package/projectOnboardingState.ts +83 -0
- package/replLauncher.tsx +27 -0
package/bin/xcode
CHANGED
|
@@ -46,7 +46,7 @@ process.env.NODE_ENV = process.env.NODE_ENV || 'production';
|
|
|
46
46
|
const args = process.argv.slice(2);
|
|
47
47
|
|
|
48
48
|
if (args[0] === '--version' || args[0] === '-v' || args[0] === '-V') {
|
|
49
|
-
console.log('xcode v3.1.
|
|
49
|
+
console.log('xcode v3.1.2 — AI coding assistant with XMem memory');
|
|
50
50
|
process.exit(0);
|
|
51
51
|
}
|
|
52
52
|
|
package/costHook.ts
ADDED
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { useEffect } from 'react'
|
|
2
|
+
import { formatTotalCost, saveCurrentSessionCosts } from './cost-tracker.js'
|
|
3
|
+
import { hasConsoleBillingAccess } from './utils/billing.js'
|
|
4
|
+
import type { FpsMetrics } from './utils/fpsTracker.js'
|
|
5
|
+
|
|
6
|
+
export function useCostSummary(
|
|
7
|
+
getFpsMetrics?: () => FpsMetrics | undefined,
|
|
8
|
+
): void {
|
|
9
|
+
useEffect(() => {
|
|
10
|
+
const f = () => {
|
|
11
|
+
if (hasConsoleBillingAccess()) {
|
|
12
|
+
process.stdout.write('\n' + formatTotalCost() + '\n')
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
saveCurrentSessionCosts(getFpsMetrics?.())
|
|
16
|
+
}
|
|
17
|
+
process.on('exit', f)
|
|
18
|
+
return () => {
|
|
19
|
+
process.off('exit', f)
|
|
20
|
+
}
|
|
21
|
+
}, [])
|
|
22
|
+
}
|
|
@@ -0,0 +1,133 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Thin launchers for one-off dialog JSX sites in main.tsx.
|
|
3
|
+
* Each launcher dynamically imports its component and wires the `done` callback
|
|
4
|
+
* identically to the original inline call site. Zero behavior change.
|
|
5
|
+
*
|
|
6
|
+
* Part of the main.tsx React/JSX extraction effort. See sibling PRs
|
|
7
|
+
* perf/extract-interactive-helpers and perf/launch-repl.
|
|
8
|
+
*/
|
|
9
|
+
import React from 'react';
|
|
10
|
+
import type { AssistantSession } from './assistant/sessionDiscovery.js';
|
|
11
|
+
import type { StatsStore } from './context/stats.js';
|
|
12
|
+
import type { Root } from './ink.js';
|
|
13
|
+
import { renderAndRun, showSetupDialog } from './interactiveHelpers.js';
|
|
14
|
+
import { KeybindingSetup } from './keybindings/KeybindingProviderSetup.js';
|
|
15
|
+
import type { AppState } from './state/AppStateStore.js';
|
|
16
|
+
import type { AgentMemoryScope } from './tools/AgentTool/agentMemory.js';
|
|
17
|
+
import type { TeleportRemoteResponse } from './utils/conversationRecovery.js';
|
|
18
|
+
import type { FpsMetrics } from './utils/fpsTracker.js';
|
|
19
|
+
import type { ValidationError } from './utils/settings/validation.js';
|
|
20
|
+
|
|
21
|
+
// Type-only access to ResumeConversation's Props via the module type.
|
|
22
|
+
// No runtime cost - erased at compile time.
|
|
23
|
+
type ResumeConversationProps = React.ComponentProps<typeof import('./screens/ResumeConversation.js').ResumeConversation>;
|
|
24
|
+
|
|
25
|
+
/**
|
|
26
|
+
* Site ~3173: SnapshotUpdateDialog (agent memory snapshot update prompt).
|
|
27
|
+
* Original callback wiring: onComplete={done}, onCancel={() => done('keep')}.
|
|
28
|
+
*/
|
|
29
|
+
export async function launchSnapshotUpdateDialog(root: Root, props: {
|
|
30
|
+
agentType: string;
|
|
31
|
+
scope: AgentMemoryScope;
|
|
32
|
+
snapshotTimestamp: string;
|
|
33
|
+
}): Promise<'merge' | 'keep' | 'replace'> {
|
|
34
|
+
const {
|
|
35
|
+
SnapshotUpdateDialog
|
|
36
|
+
} = await import('./components/agents/SnapshotUpdateDialog.js');
|
|
37
|
+
return showSetupDialog<'merge' | 'keep' | 'replace'>(root, done => <SnapshotUpdateDialog agentType={props.agentType} scope={props.scope} snapshotTimestamp={props.snapshotTimestamp} onComplete={done} onCancel={() => done('keep')} />);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* Site ~3250: InvalidSettingsDialog (settings validation errors).
|
|
42
|
+
* Original callback wiring: onContinue={done}, onExit passed through from caller.
|
|
43
|
+
*/
|
|
44
|
+
export async function launchInvalidSettingsDialog(root: Root, props: {
|
|
45
|
+
settingsErrors: ValidationError[];
|
|
46
|
+
onExit: () => void;
|
|
47
|
+
}): Promise<void> {
|
|
48
|
+
const {
|
|
49
|
+
InvalidSettingsDialog
|
|
50
|
+
} = await import('./components/InvalidSettingsDialog.js');
|
|
51
|
+
return showSetupDialog(root, done => <InvalidSettingsDialog settingsErrors={props.settingsErrors} onContinue={done} onExit={props.onExit} />);
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
/**
|
|
55
|
+
* Site ~4229: AssistantSessionChooser (pick a bridge session to attach to).
|
|
56
|
+
* Original callback wiring: onSelect={id => done(id)}, onCancel={() => done(null)}.
|
|
57
|
+
*/
|
|
58
|
+
export async function launchAssistantSessionChooser(root: Root, props: {
|
|
59
|
+
sessions: AssistantSession[];
|
|
60
|
+
}): Promise<string | null> {
|
|
61
|
+
const {
|
|
62
|
+
AssistantSessionChooser
|
|
63
|
+
} = await import('./assistant/AssistantSessionChooser.js');
|
|
64
|
+
return showSetupDialog<string | null>(root, done => <AssistantSessionChooser sessions={props.sessions} onSelect={id => done(id)} onCancel={() => done(null)} />);
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
/**
|
|
68
|
+
* `claude assistant` found zero sessions — show the same install wizard
|
|
69
|
+
* as `/assistant` when daemon.json is empty. Resolves to the installed dir on
|
|
70
|
+
* success, null on cancel. Rejects on install failure so the caller can
|
|
71
|
+
* distinguish errors from user cancellation.
|
|
72
|
+
*/
|
|
73
|
+
export async function launchAssistantInstallWizard(root: Root): Promise<string | null> {
|
|
74
|
+
const {
|
|
75
|
+
NewInstallWizard,
|
|
76
|
+
computeDefaultInstallDir
|
|
77
|
+
} = await import('./commands/assistant/assistant.js');
|
|
78
|
+
const defaultDir = await computeDefaultInstallDir();
|
|
79
|
+
let rejectWithError: (reason: Error) => void;
|
|
80
|
+
const errorPromise = new Promise<never>((_, reject) => {
|
|
81
|
+
rejectWithError = reject;
|
|
82
|
+
});
|
|
83
|
+
const resultPromise = showSetupDialog<string | null>(root, done => <NewInstallWizard defaultDir={defaultDir} onInstalled={dir => done(dir)} onCancel={() => done(null)} onError={message => rejectWithError(new Error(`Installation failed: ${message}`))} />);
|
|
84
|
+
return Promise.race([resultPromise, errorPromise]);
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
/**
|
|
88
|
+
* Site ~4549: TeleportResumeWrapper (interactive teleport session picker).
|
|
89
|
+
* Original callback wiring: onComplete={done}, onCancel={() => done(null)}, source="cliArg".
|
|
90
|
+
*/
|
|
91
|
+
export async function launchTeleportResumeWrapper(root: Root): Promise<TeleportRemoteResponse | null> {
|
|
92
|
+
const {
|
|
93
|
+
TeleportResumeWrapper
|
|
94
|
+
} = await import('./components/TeleportResumeWrapper.js');
|
|
95
|
+
return showSetupDialog<TeleportRemoteResponse | null>(root, done => <TeleportResumeWrapper onComplete={done} onCancel={() => done(null)} source="cliArg" />);
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Site ~4597: TeleportRepoMismatchDialog (pick a local checkout of the target repo).
|
|
100
|
+
* Original callback wiring: onSelectPath={done}, onCancel={() => done(null)}.
|
|
101
|
+
*/
|
|
102
|
+
export async function launchTeleportRepoMismatchDialog(root: Root, props: {
|
|
103
|
+
targetRepo: string;
|
|
104
|
+
initialPaths: string[];
|
|
105
|
+
}): Promise<string | null> {
|
|
106
|
+
const {
|
|
107
|
+
TeleportRepoMismatchDialog
|
|
108
|
+
} = await import('./components/TeleportRepoMismatchDialog.js');
|
|
109
|
+
return showSetupDialog<string | null>(root, done => <TeleportRepoMismatchDialog targetRepo={props.targetRepo} initialPaths={props.initialPaths} onSelectPath={done} onCancel={() => done(null)} />);
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
/**
|
|
113
|
+
* Site ~4903: ResumeConversation mount (interactive session picker).
|
|
114
|
+
* Uses renderAndRun, NOT showSetupDialog. Wraps in <App><KeybindingSetup>.
|
|
115
|
+
* Preserves original Promise.all parallelism between getWorktreePaths and imports.
|
|
116
|
+
*/
|
|
117
|
+
export async function launchResumeChooser(root: Root, appProps: {
|
|
118
|
+
getFpsMetrics: () => FpsMetrics | undefined;
|
|
119
|
+
stats: StatsStore;
|
|
120
|
+
initialState: AppState;
|
|
121
|
+
}, worktreePathsPromise: Promise<string[]>, resumeProps: Omit<ResumeConversationProps, 'worktreePaths'>): Promise<void> {
|
|
122
|
+
const [worktreePaths, {
|
|
123
|
+
ResumeConversation
|
|
124
|
+
}, {
|
|
125
|
+
App
|
|
126
|
+
}] = await Promise.all([worktreePathsPromise, import('./screens/ResumeConversation.js'), import('./components/App.js')]);
|
|
127
|
+
await renderAndRun(root, <App getFpsMetrics={appProps.getFpsMetrics} stats={appProps.stats} initialState={appProps.initialState}>
|
|
128
|
+
<KeybindingSetup>
|
|
129
|
+
<ResumeConversation {...resumeProps} worktreePaths={worktreePaths} />
|
|
130
|
+
</KeybindingSetup>
|
|
131
|
+
</App>);
|
|
132
|
+
}
|
|
133
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["React","AssistantSession","StatsStore","Root","renderAndRun","showSetupDialog","KeybindingSetup","AppState","AgentMemoryScope","TeleportRemoteResponse","FpsMetrics","ValidationError","ResumeConversationProps","ComponentProps","ResumeConversation","launchSnapshotUpdateDialog","root","props","agentType","scope","snapshotTimestamp","Promise","SnapshotUpdateDialog","done","launchInvalidSettingsDialog","settingsErrors","onExit","InvalidSettingsDialog","launchAssistantSessionChooser","sessions","AssistantSessionChooser","id","launchAssistantInstallWizard","NewInstallWizard","computeDefaultInstallDir","defaultDir","rejectWithError","reason","Error","errorPromise","_","reject","resultPromise","dir","message","race","launchTeleportResumeWrapper","TeleportResumeWrapper","launchTeleportRepoMismatchDialog","targetRepo","initialPaths","TeleportRepoMismatchDialog","launchResumeChooser","appProps","getFpsMetrics","stats","initialState","worktreePathsPromise","resumeProps","Omit","worktreePaths","App","all"],"sources":["dialogLaunchers.tsx"],"sourcesContent":["/**\n * Thin launchers for one-off dialog JSX sites in main.tsx.\n * Each launcher dynamically imports its component and wires the `done` callback\n * identically to the original inline call site. Zero behavior change.\n *\n * Part of the main.tsx React/JSX extraction effort. See sibling PRs\n * perf/extract-interactive-helpers and perf/launch-repl.\n */\nimport React from 'react'\nimport type { AssistantSession } from './assistant/sessionDiscovery.js'\nimport type { StatsStore } from './context/stats.js'\nimport type { Root } from './ink.js'\nimport { renderAndRun, showSetupDialog } from './interactiveHelpers.js'\nimport { KeybindingSetup } from './keybindings/KeybindingProviderSetup.js'\nimport type { AppState } from './state/AppStateStore.js'\nimport type { AgentMemoryScope } from './tools/AgentTool/agentMemory.js'\nimport type { TeleportRemoteResponse } from './utils/conversationRecovery.js'\nimport type { FpsMetrics } from './utils/fpsTracker.js'\nimport type { ValidationError } from './utils/settings/validation.js'\n\n// Type-only access to ResumeConversation's Props via the module type.\n// No runtime cost - erased at compile time.\ntype ResumeConversationProps = React.ComponentProps<\n  typeof import('./screens/ResumeConversation.js').ResumeConversation\n>\n\n/**\n * Site ~3173: SnapshotUpdateDialog (agent memory snapshot update prompt).\n * Original callback wiring: onComplete={done}, onCancel={() => done('keep')}.\n */\nexport async function launchSnapshotUpdateDialog(\n  root: Root,\n  props: {\n    agentType: string\n    scope: AgentMemoryScope\n    snapshotTimestamp: string\n  },\n): Promise<'merge' | 'keep' | 'replace'> {\n  const { SnapshotUpdateDialog } = await import(\n    './components/agents/SnapshotUpdateDialog.js'\n  )\n  return showSetupDialog<'merge' | 'keep' | 'replace'>(root, done => (\n    <SnapshotUpdateDialog\n      agentType={props.agentType}\n      scope={props.scope}\n      snapshotTimestamp={props.snapshotTimestamp}\n      onComplete={done}\n      onCancel={() => done('keep')}\n    />\n  ))\n}\n\n/**\n * Site ~3250: InvalidSettingsDialog (settings validation errors).\n * Original callback wiring: onContinue={done}, onExit passed through from caller.\n */\nexport async function launchInvalidSettingsDialog(\n  root: Root,\n  props: {\n    settingsErrors: ValidationError[]\n    onExit: () => void\n  },\n): Promise<void> {\n  const { InvalidSettingsDialog } = await import(\n    './components/InvalidSettingsDialog.js'\n  )\n  return showSetupDialog(root, done => (\n    <InvalidSettingsDialog\n      settingsErrors={props.settingsErrors}\n      onContinue={done}\n      onExit={props.onExit}\n    />\n  ))\n}\n\n/**\n * Site ~4229: AssistantSessionChooser (pick a bridge session to attach to).\n * Original callback wiring: onSelect={id => done(id)}, onCancel={() => done(null)}.\n */\nexport async function launchAssistantSessionChooser(\n  root: Root,\n  props: { sessions: AssistantSession[] },\n): Promise<string | null> {\n  const { AssistantSessionChooser } = await import(\n    './assistant/AssistantSessionChooser.js'\n  )\n  return showSetupDialog<string | null>(root, done => (\n    <AssistantSessionChooser\n      sessions={props.sessions}\n      onSelect={id => done(id)}\n      onCancel={() => done(null)}\n    />\n  ))\n}\n\n/**\n * `claude assistant` found zero sessions — show the same install wizard\n * as `/assistant` when daemon.json is empty. Resolves to the installed dir on\n * success, null on cancel. Rejects on install failure so the caller can\n * distinguish errors from user cancellation.\n */\nexport async function launchAssistantInstallWizard(\n  root: Root,\n): Promise<string | null> {\n  const { NewInstallWizard, computeDefaultInstallDir } = await import(\n    './commands/assistant/assistant.js'\n  )\n  const defaultDir = await computeDefaultInstallDir()\n  let rejectWithError: (reason: Error) => void\n  const errorPromise = new Promise<never>((_, reject) => {\n    rejectWithError = reject\n  })\n  const resultPromise = showSetupDialog<string | null>(root, done => (\n    <NewInstallWizard\n      defaultDir={defaultDir}\n      onInstalled={dir => done(dir)}\n      onCancel={() => done(null)}\n      onError={message =>\n        rejectWithError(new Error(`Installation failed: ${message}`))\n      }\n    />\n  ))\n  return Promise.race([resultPromise, errorPromise])\n}\n\n/**\n * Site ~4549: TeleportResumeWrapper (interactive teleport session picker).\n * Original callback wiring: onComplete={done}, onCancel={() => done(null)}, source=\"cliArg\".\n */\nexport async function launchTeleportResumeWrapper(\n  root: Root,\n): Promise<TeleportRemoteResponse | null> {\n  const { TeleportResumeWrapper } = await import(\n    './components/TeleportResumeWrapper.js'\n  )\n  return showSetupDialog<TeleportRemoteResponse | null>(root, done => (\n    <TeleportResumeWrapper\n      onComplete={done}\n      onCancel={() => done(null)}\n      source=\"cliArg\"\n    />\n  ))\n}\n\n/**\n * Site ~4597: TeleportRepoMismatchDialog (pick a local checkout of the target repo).\n * Original callback wiring: onSelectPath={done}, onCancel={() => done(null)}.\n */\nexport async function launchTeleportRepoMismatchDialog(\n  root: Root,\n  props: {\n    targetRepo: string\n    initialPaths: string[]\n  },\n): Promise<string | null> {\n  const { TeleportRepoMismatchDialog } = await import(\n    './components/TeleportRepoMismatchDialog.js'\n  )\n  return showSetupDialog<string | null>(root, done => (\n    <TeleportRepoMismatchDialog\n      targetRepo={props.targetRepo}\n      initialPaths={props.initialPaths}\n      onSelectPath={done}\n      onCancel={() => done(null)}\n    />\n  ))\n}\n\n/**\n * Site ~4903: ResumeConversation mount (interactive session picker).\n * Uses renderAndRun, NOT showSetupDialog. Wraps in <App><KeybindingSetup>.\n * Preserves original Promise.all parallelism between getWorktreePaths and imports.\n */\nexport async function launchResumeChooser(\n  root: Root,\n  appProps: {\n    getFpsMetrics: () => FpsMetrics | undefined\n    stats: StatsStore\n    initialState: AppState\n  },\n  worktreePathsPromise: Promise<string[]>,\n  resumeProps: Omit<ResumeConversationProps, 'worktreePaths'>,\n): Promise<void> {\n  const [worktreePaths, { ResumeConversation }, { App }] = await Promise.all([\n    worktreePathsPromise,\n    import('./screens/ResumeConversation.js'),\n    import('./components/App.js'),\n  ])\n  await renderAndRun(\n    root,\n    <App\n      getFpsMetrics={appProps.getFpsMetrics}\n      stats={appProps.stats}\n      initialState={appProps.initialState}\n    >\n      <KeybindingSetup>\n        <ResumeConversation {...resumeProps} worktreePaths={worktreePaths} />\n      </KeybindingSetup>\n    </App>,\n  )\n}\n"],"mappings":"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","ignoreList":[]}
|
package/entrypoints/cli.tsx
CHANGED
|
@@ -39,7 +39,7 @@ async function main(): Promise<void> {
|
|
|
39
39
|
if (args.length === 1 && (args[0] === '--version' || args[0] === '-v' || args[0] === '-V')) {
|
|
40
40
|
// MACRO.VERSION is inlined at build time
|
|
41
41
|
// biome-ignore lint/suspicious/noConsole:: intentional console output
|
|
42
|
-
console.log(`xcode v3.1.
|
|
42
|
+
console.log(`xcode v3.1.2 — AI coding assistant with XMem memory`);
|
|
43
43
|
return;
|
|
44
44
|
}
|
|
45
45
|
|
package/macro.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@xortex/xcode",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.2",
|
|
4
4
|
"description": "XCode - AI-powered coding assistant with XMem long-term memory. Supports Claude, Gemini, Kimi, DeepSeek via OpenRouter.",
|
|
5
5
|
"main": "main.tsx",
|
|
6
6
|
"bin": {
|
|
@@ -43,11 +43,15 @@
|
|
|
43
43
|
"tsconfig.json",
|
|
44
44
|
"macro.ts",
|
|
45
45
|
"main.tsx",
|
|
46
|
+
"ink.ts",
|
|
46
47
|
"commands.ts",
|
|
47
48
|
"context.ts",
|
|
48
49
|
"cost-tracker.ts",
|
|
50
|
+
"costHook.ts",
|
|
49
51
|
"history.ts",
|
|
50
52
|
"interactiveHelpers.tsx",
|
|
53
|
+
"replLauncher.tsx",
|
|
54
|
+
"dialogLaunchers.tsx",
|
|
51
55
|
"QueryEngine.ts",
|
|
52
56
|
"query.ts",
|
|
53
57
|
"setup.ts",
|
|
@@ -55,7 +59,7 @@
|
|
|
55
59
|
"Task.ts",
|
|
56
60
|
"Tool.ts",
|
|
57
61
|
"tools.ts",
|
|
58
|
-
"
|
|
62
|
+
"projectOnboardingState.ts",
|
|
59
63
|
"README.md",
|
|
60
64
|
"LICENSE"
|
|
61
65
|
],
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
import memoize from 'lodash-es/memoize.js'
|
|
2
|
+
import { join } from 'path'
|
|
3
|
+
import {
|
|
4
|
+
getCurrentProjectConfig,
|
|
5
|
+
saveCurrentProjectConfig,
|
|
6
|
+
} from './utils/config.js'
|
|
7
|
+
import { getCwd } from './utils/cwd.js'
|
|
8
|
+
import { isDirEmpty } from './utils/file.js'
|
|
9
|
+
import { getFsImplementation } from './utils/fsOperations.js'
|
|
10
|
+
|
|
11
|
+
export type Step = {
|
|
12
|
+
key: string
|
|
13
|
+
text: string
|
|
14
|
+
isComplete: boolean
|
|
15
|
+
isCompletable: boolean
|
|
16
|
+
isEnabled: boolean
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export function getSteps(): Step[] {
|
|
20
|
+
const hasClaudeMd = getFsImplementation().existsSync(
|
|
21
|
+
join(getCwd(), 'CLAUDE.md'),
|
|
22
|
+
)
|
|
23
|
+
const isWorkspaceDirEmpty = isDirEmpty(getCwd())
|
|
24
|
+
|
|
25
|
+
return [
|
|
26
|
+
{
|
|
27
|
+
key: 'workspace',
|
|
28
|
+
text: 'Ask Claude to create a new app or clone a repository',
|
|
29
|
+
isComplete: false,
|
|
30
|
+
isCompletable: true,
|
|
31
|
+
isEnabled: isWorkspaceDirEmpty,
|
|
32
|
+
},
|
|
33
|
+
{
|
|
34
|
+
key: 'claudemd',
|
|
35
|
+
text: 'Run /init to create a CLAUDE.md file with instructions for Claude',
|
|
36
|
+
isComplete: hasClaudeMd,
|
|
37
|
+
isCompletable: true,
|
|
38
|
+
isEnabled: !isWorkspaceDirEmpty,
|
|
39
|
+
},
|
|
40
|
+
]
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export function isProjectOnboardingComplete(): boolean {
|
|
44
|
+
return getSteps()
|
|
45
|
+
.filter(({ isCompletable, isEnabled }) => isCompletable && isEnabled)
|
|
46
|
+
.every(({ isComplete }) => isComplete)
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export function maybeMarkProjectOnboardingComplete(): void {
|
|
50
|
+
// Short-circuit on cached config — isProjectOnboardingComplete() hits
|
|
51
|
+
// the filesystem, and REPL.tsx calls this on every prompt submit.
|
|
52
|
+
if (getCurrentProjectConfig().hasCompletedProjectOnboarding) {
|
|
53
|
+
return
|
|
54
|
+
}
|
|
55
|
+
if (isProjectOnboardingComplete()) {
|
|
56
|
+
saveCurrentProjectConfig(current => ({
|
|
57
|
+
...current,
|
|
58
|
+
hasCompletedProjectOnboarding: true,
|
|
59
|
+
}))
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
export const shouldShowProjectOnboarding = memoize((): boolean => {
|
|
64
|
+
const projectConfig = getCurrentProjectConfig()
|
|
65
|
+
// Short-circuit on cached config before isProjectOnboardingComplete()
|
|
66
|
+
// hits the filesystem — this runs during first render.
|
|
67
|
+
if (
|
|
68
|
+
projectConfig.hasCompletedProjectOnboarding ||
|
|
69
|
+
projectConfig.projectOnboardingSeenCount >= 4 ||
|
|
70
|
+
process.env.IS_DEMO
|
|
71
|
+
) {
|
|
72
|
+
return false
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
return !isProjectOnboardingComplete()
|
|
76
|
+
})
|
|
77
|
+
|
|
78
|
+
export function incrementProjectOnboardingSeenCount(): void {
|
|
79
|
+
saveCurrentProjectConfig(current => ({
|
|
80
|
+
...current,
|
|
81
|
+
projectOnboardingSeenCount: current.projectOnboardingSeenCount + 1,
|
|
82
|
+
}))
|
|
83
|
+
}
|
package/replLauncher.tsx
ADDED
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
import React from "react";
|
|
2
|
+
import type { StatsStore } from "./context/stats.js";
|
|
3
|
+
import type { Root } from "./ink.js";
|
|
4
|
+
import type { Props as REPLProps } from "./screens/REPL.js";
|
|
5
|
+
import type { AppState } from "./state/AppStateStore.js";
|
|
6
|
+
import type { FpsMetrics } from "./utils/fpsTracker.js";
|
|
7
|
+
type AppWrapperProps = {
|
|
8
|
+
getFpsMetrics: () => FpsMetrics | undefined;
|
|
9
|
+
stats?: StatsStore;
|
|
10
|
+
initialState: AppState;
|
|
11
|
+
};
|
|
12
|
+
export async function launchRepl(
|
|
13
|
+
root: Root,
|
|
14
|
+
appProps: AppWrapperProps,
|
|
15
|
+
replProps: REPLProps,
|
|
16
|
+
renderAndRun: (root: Root, element: React.ReactNode) => Promise<void>,
|
|
17
|
+
): Promise<void> {
|
|
18
|
+
const { App } = await import("./components/App.js");
|
|
19
|
+
const { REPL } = await import("./screens/REPL.js");
|
|
20
|
+
await renderAndRun(
|
|
21
|
+
root,
|
|
22
|
+
<App {...appProps}>
|
|
23
|
+
<REPL {...replProps} />
|
|
24
|
+
</App>,
|
|
25
|
+
);
|
|
26
|
+
}
|
|
27
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJSZWFjdCIsIlN0YXRzU3RvcmUiLCJSb290IiwiUHJvcHMiLCJSRVBMUHJvcHMiLCJBcHBTdGF0ZSIsIkZwc01ldHJpY3MiLCJBcHBXcmFwcGVyUHJvcHMiLCJnZXRGcHNNZXRyaWNzIiwic3RhdHMiLCJpbml0aWFsU3RhdGUiLCJsYXVuY2hSZXBsIiwicm9vdCIsImFwcFByb3BzIiwicmVwbFByb3BzIiwicmVuZGVyQW5kUnVuIiwiZWxlbWVudCIsIlJlYWN0Tm9kZSIsIlByb21pc2UiLCJBcHAiLCJSRVBMIl0sInNvdXJjZXMiOlsicmVwbExhdW5jaGVyLnRzeCJdLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnXG5pbXBvcnQgdHlwZSB7IFN0YXRzU3RvcmUgfSBmcm9tICcuL2NvbnRleHQvc3RhdHMuanMnXG5pbXBvcnQgdHlwZSB7IFJvb3QgfSBmcm9tICcuL2luay5qcydcbmltcG9ydCB0eXBlIHsgUHJvcHMgYXMgUkVQTFByb3BzIH0gZnJvbSAnLi9zY3JlZW5zL1JFUEwuanMnXG5pbXBvcnQgdHlwZSB7IEFwcFN0YXRlIH0gZnJvbSAnLi9zdGF0ZS9BcHBTdGF0ZVN0b3JlLmpzJ1xuaW1wb3J0IHR5cGUgeyBGcHNNZXRyaWNzIH0gZnJvbSAnLi91dGlscy9mcHNUcmFja2VyLmpzJ1xuXG50eXBlIEFwcFdyYXBwZXJQcm9wcyA9IHtcbiAgZ2V0RnBzTWV0cmljczogKCkgPT4gRnBzTWV0cmljcyB8IHVuZGVmaW5lZFxuICBzdGF0cz86IFN0YXRzU3RvcmVcbiAgaW5pdGlhbFN0YXRlOiBBcHBTdGF0ZVxufVxuXG5leHBvcnQgYXN5bmMgZnVuY3Rpb24gbGF1bmNoUmVwbChcbiAgcm9vdDogUm9vdCxcbiAgYXBwUHJvcHM6IEFwcFdyYXBwZXJQcm9wcyxcbiAgcmVwbFByb3BzOiBSRVBMUHJvcHMsXG4gIHJlbmRlckFuZFJ1bjogKHJvb3Q6IFJvb3QsIGVsZW1lbnQ6IFJlYWN0LlJlYWN0Tm9kZSkgPT4gUHJvbWlzZTx2b2lkPixcbik6IFByb21pc2U8dm9pZD4ge1xuICBjb25zdCB7IEFwcCB9ID0gYXdhaXQgaW1wb3J0KCcuL2NvbXBvbmVudHMvQXBwLmpzJylcbiAgY29uc3QgeyBSRVBMIH0gPSBhd2FpdCBpbXBvcnQoJy4vc2NyZWVucy9SRVBMLmpzJylcbiAgYXdhaXQgcmVuZGVyQW5kUnVuKFxuICAgIHJvb3QsXG4gICAgPEFwcCB7Li4uYXBwUHJvcHN9PlxuICAgICAgPFJFUEwgey4uLnJlcGxQcm9wc30gLz5cbiAgICA8L0FwcD4sXG4gIClcbn1cbiJdLCJtYXBwaW5ncyI6IkFBQUEsT0FBT0EsS0FBSyxNQUFNLE9BQU87QUFDekIsY0FBY0MsVUFBVSxRQUFRLG9CQUFvQjtBQUNwRCxjQUFjQyxJQUFJLFFBQVEsVUFBVTtBQUNwQyxjQUFjQyxLQUFLLElBQUlDLFNBQVMsUUFBUSxtQkFBbUI7QUFDM0QsY0FBY0MsUUFBUSxRQUFRLDBCQUEwQjtBQUN4RCxjQUFjQyxVQUFVLFFBQVEsdUJBQXVCO0FBRXZELEtBQUtDLGVBQWUsR0FBRztFQUNyQkMsYUFBYSxFQUFFLEdBQUcsR0FBR0YsVUFBVSxHQUFHLFNBQVM7RUFDM0NHLEtBQUssQ0FBQyxFQUFFUixVQUFVO0VBQ2xCUyxZQUFZLEVBQUVMLFFBQVE7QUFDeEIsQ0FBQztBQUVELE9BQU8sZUFBZU0sVUFBVUEsQ0FDOUJDLElBQUksRUFBRVYsSUFBSSxFQUNWVyxRQUFRLEVBQUVOLGVBQWUsRUFDekJPLFNBQVMsRUFBRVYsU0FBUyxFQUNwQlcsWUFBWSxFQUFFLENBQUNILElBQUksRUFBRVYsSUFBSSxFQUFFYyxPQUFPLEVBQUVoQixLQUFLLENBQUNpQixTQUFTLEVBQUUsR0FBR0MsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUN0RSxFQUFFQSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUM7RUFDZixNQUFNO0lBQUVDO0VBQUksQ0FBQyxHQUFHLE1BQU0sTUFBTSxDQUFDLHFCQUFxQixDQUFDO0VBQ25ELE1BQU07SUFBRUM7RUFBSyxDQUFDLEdBQUcsTUFBTSxNQUFNLENBQUMsbUJBQW1CLENBQUM7RUFDbEQsTUFBTUwsWUFBWSxDQUNoQkgsSUFBSSxFQUNKLENBQUMsR0FBRyxDQUFDLElBQUlDLFFBQVEsQ0FBQztBQUN0QixNQUFNLENBQUMsSUFBSSxDQUFDLElBQUlDLFNBQVMsQ0FBQztBQUMxQixJQUFJLEVBQUUsR0FBRyxDQUNQLENBQUM7QUFDSCIsImlnbm9yZUxpc3QiOltdfQ==
|