Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 32 additions & 94 deletions apps/desktop/renderer-architecture.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
"src/renderer/model-connection-errors.ts",
"src/renderer/nav-selection.ts",
"src/renderer/new-task-reload-intent.ts",
"src/renderer/observable-state.ts",
"src/renderer/onboarding-hero-copy.ts",
"src/renderer/onboarding-hero.tsx",
"src/renderer/onboarding-provider-types.ts",
Expand All @@ -109,11 +108,9 @@
"src/renderer/project-path-display.ts",
"src/renderer/remote-project-directory-dialog.tsx",
"src/renderer/scroll-motion-policy.ts",
"src/renderer/session-catalog-state.ts",
"src/renderer/session-collaboration-dialog.tsx",
"src/renderer/session-copy-attempt.ts",
"src/renderer/session-error-presentation.ts",
"src/renderer/session-event-health.ts",
"src/renderer/session-health-notice.ts",
"src/renderer/session-read-state.ts",
"src/renderer/session-status-presentation.ts",
Expand Down Expand Up @@ -201,7 +198,6 @@
"src/renderer/shell-run-update-state.ts",
"src/renderer/side-chat-command.ts",
"src/renderer/skill-invocation-feedback.ts",
"src/renderer/stale-sessions.ts",
"src/renderer/task-readiness-notice.ts",
"src/renderer/theme.ts",
"src/renderer/titlebar-dim-color.ts",
Expand All @@ -213,7 +209,6 @@
"src/renderer/use-app-shell-session-ui-reads.ts",
"src/renderer/use-app-shell-session-workspace.ts",
"src/renderer/use-deep-research-run.ts",
"src/renderer/use-external-store-selector.ts",
"src/renderer/use-new-task-choice.ts",
"src/renderer/use-onboarding-snapshot.ts",
"src/renderer/use-project-context.ts",
Expand All @@ -240,11 +235,8 @@
"legacyFeatureImports": [
"src/renderer/features/module-hub/controller/use-daily-review-controller.ts -> src/renderer/daily-review-actions",
"src/renderer/features/module-hub/ui/module-hub-host.tsx -> src/renderer/mcp-page",
"src/renderer/features/session-navigation/controller/use-session-navigation-controller.ts -> src/renderer/use-external-store-selector",
"src/renderer/features/session-navigation/controller/use-session-navigation-reads.ts -> src/renderer/use-external-store-selector",
"src/renderer/features/session-navigation/model/session-list-layout.ts -> src/renderer/browser-storage",
"src/renderer/features/session-navigation/model/session-rail-layout-store.ts -> src/renderer/browser-storage",
"src/renderer/features/session-navigation/model/session-rail-layout-store.ts -> src/renderer/observable-state",
"src/renderer/features/task-entry/model/task-entry-selection.ts -> src/renderer/new-task-reload-intent",
"src/renderer/features/task-entry/ui/task-entry-host.tsx -> src/renderer/remote-project-directory-dialog",
"src/renderer/features/workbar/controller/use-workbar-controller.ts -> src/renderer/browser-storage",
Expand Down Expand Up @@ -388,8 +380,8 @@
"./locales/shell-copy.js": 1,
"react": 1
},
"importSpecifiers": 9,
"nonTriviaTokens": 2275
"importSpecifiers": 8,
"nonTriviaTokens": 2234
},
"src/renderer/app-shell-context-compaction.ts": {
"importDeclarations": 0,
Expand Down Expand Up @@ -454,7 +446,7 @@
"nonTriviaTokens": 637
},
"src/renderer/app-shell-effects.ts": {
"importDeclarations": 10,
"importDeclarations": 9,
"bridgePaths": {
"window.maka.app.info": 1,
"window.maka.appWindow.subscribeCommand": 1,
Expand Down Expand Up @@ -491,19 +483,20 @@
"actionFactories": [],
"dependencyPaths": {
"./app-shell-copy": 1,
"./application/contracts/session-catalog/session-change-effects.js": 1,
"./application/contracts/session-catalog/session-event-health.js": 1,
"./browser-storage": 1,
"./locales/conversation-copy.js": 1,
"./platform/desktop/desktop-transcript-range-store.js": 1,
"./session-event-health": 1,
"./shell-run-update-state.js": 1,
"./theme": 1,
"./titlebar-modal-sync": 1,
"@astryxdesign/core/hooks": 1,
"@maka/core/session-event-health": 1,
"react": 1
},
"importSpecifiers": 18,
"nonTriviaTokens": 3677
"importSpecifiers": 14,
"nonTriviaTokens": 3512
},
"src/renderer/app-shell-overlays.tsx": {
"importDeclarations": 5,
Expand Down Expand Up @@ -533,7 +526,7 @@
"react": 1
},
"importSpecifiers": 8,
"nonTriviaTokens": 860
"nonTriviaTokens": 858
},
"src/renderer/app-shell-project-actions.ts": {
"importDeclarations": 4,
Expand Down Expand Up @@ -711,7 +704,7 @@
"nonTriviaTokens": 1245
},
"src/renderer/app-shell.tsx": {
"importDeclarations": 64,
"importDeclarations": 63,
"bridgePaths": {
"window.maka.attachments": 1,
"window.maka.attachments.readBytes": 1,
Expand Down Expand Up @@ -750,7 +743,7 @@
"useAppShellSessionWorkspace": 1,
"useAppShellTurnPresentation": 1,
"useComposerAttachments": 1,
"useEffect": 7,
"useEffect": 6,
"useLayoutEffect": 2,
"useNewTaskChoice": 1,
"useOnboardingSnapshot": 1,
Expand Down Expand Up @@ -793,6 +786,7 @@
"./app-shell-stop-action": 1,
"./app-shell-turn-actions": 1,
"./app-shell-turn-view-model": 1,
"./application/contracts/session-catalog/catalog-row-watch.js": 1,
"./chat-composer-region": 1,
"./chat-message-surface": 1,
"./composer-defaults": 1,
Expand Down Expand Up @@ -832,7 +826,6 @@
"./settings/provider-display": 1,
"./settings/runtime-host-ssh-terminal-dialog.js": 1,
"./shell/frame-style": 1,
"./stale-sessions": 1,
"./use-active-execution-boundary": 1,
"./use-app-shell-composer-quotes": 1,
"./use-app-shell-session-ui-reads": 1,
Expand Down Expand Up @@ -860,8 +853,8 @@
"@maka/ui": 1,
"react": 1
},
"importSpecifiers": 100,
"nonTriviaTokens": 13003
"importSpecifiers": 99,
"nonTriviaTokens": 12972
},
"src/renderer/use-app-shell-composer-quotes.ts": {
"importDeclarations": 0,
Expand All @@ -878,35 +871,36 @@
"nonTriviaTokens": 24
},
"src/renderer/use-app-shell-session-list.ts": {
"importDeclarations": 6,
"importDeclarations": 5,
"bridgePaths": {
"window.maka.sessions.list": 1
},
"environmentCapabilities": {},
"hookCalls": {
"useExternalStoreSelector": 3,
"useRef": 4,
"useExternalStoreSelector": 1,
"useRef": 1,
"useUiLocale": 1
},
"lifecycleMethods": {},
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"./features/conversation/index.js": 1,
"./application/contracts/session-catalog/session-catalog-state.js": 1,
"./application/contracts/session-catalog/session-id-set.js": 1,
"./application/contracts/session-catalog/use-external-store-selector.js": 1,
"./locales/conversation-copy.js": 1,
"./locales/shell-copy.js": 1,
"./session-catalog-state.js": 1,
"./platform/desktop/session-catalog-sync.js": 1,
"./session-read-state.js": 1,
"./session-status-presentation.js": 1,
"./use-external-store-selector.js": 1,
"@maka/ui": 1,
"react": 1
},
"importSpecifiers": 9,
"importSpecifiers": 6,
"nonTriviaTokens": 486
},
"src/renderer/use-app-shell-session-ui-reads.ts": {
"importDeclarations": 1,
"importDeclarations": 0,
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {
Expand All @@ -916,14 +910,14 @@
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"./features/conversation/index.js": 1,
"./use-external-store-selector.js": 1
"./application/contracts/session-catalog/use-external-store-selector.js": 1,
"./features/conversation/index.js": 1
},
"importSpecifiers": 1,
"importSpecifiers": 0,
"nonTriviaTokens": 135
},
"src/renderer/use-app-shell-session-workspace.ts": {
"importDeclarations": 7,
"importDeclarations": 5,
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {
Expand All @@ -937,17 +931,17 @@
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"./application/contracts/session-catalog/session-catalog-state.js": 1,
"./application/contracts/session-catalog/use-external-store-selector.js": 1,
"./bootstrap-selection-lease.js": 1,
"./features/conversation/index.js": 1,
"./new-task-reload-intent.js": 1,
"./session-catalog-state.js": 1,
"./session-workspace-actions.js": 1,
"./use-app-shell-session-list.js": 1,
"./use-external-store-selector.js": 1,
"react": 1
},
"importSpecifiers": 8,
"nonTriviaTokens": 461
"importSpecifiers": 5,
"nonTriviaTokens": 459
}
},
"closure": {
Expand Down Expand Up @@ -1110,12 +1104,12 @@
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"./application/contracts/session-catalog/use-external-store-selector.js": 1,
"./chat-recovery-notice": 1,
"./features/conversation/index.js": 1,
"./locales/shell-copy": 1,
"./onboarding-hero": 1,
"./use-deep-research-run": 1,
"./use-external-store-selector": 1,
"@astryxdesign/core": 1,
"@maka/core/deep-research": 1,
"@maka/ui": 1,
Expand Down Expand Up @@ -1839,15 +1833,6 @@
"actionFactories": [],
"dependencyPaths": {}
},
"src/renderer/observable-state.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {},
"lifecycleMethods": {},
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {}
},
"src/renderer/onboarding-hero-copy.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
Expand Down Expand Up @@ -2004,20 +1989,6 @@
"actionFactories": [],
"dependencyPaths": {}
},
"src/renderer/session-catalog-state.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {
"useRef": 1
},
"lifecycleMethods": {},
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"./observable-state.js": 1,
"react": 1
}
},
"src/renderer/session-collaboration-dialog.tsx": {
"bridgePaths": {
"window.maka.localRuntimeHostRemoteAccess.getSnapshot": 2,
Expand Down Expand Up @@ -2075,18 +2046,6 @@
"./locales/conversation-copy.js": 1
}
},
"src/renderer/session-event-health.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {},
"lifecycleMethods": {},
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"@maka/core/session-event-health": 1,
"@maka/core/tool-result-status": 1
}
},
"src/renderer/session-health-notice.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
Expand Down Expand Up @@ -3486,6 +3445,7 @@
"actionFactories": [],
"dependencyPaths": {
"../../shared/settings-ownership.js": 1,
"../application/contracts/session-catalog/catalog-sessions.js": 1,
"../browser-storage": 1,
"../features/connection-settings": 1,
"../features/external-agent-settings/index.js": 1,
Expand Down Expand Up @@ -3845,15 +3805,6 @@
"./locales/shell-copy.js": 1
}
},
"src/renderer/stale-sessions.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {},
"lifecycleMethods": {},
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {}
},
"src/renderer/task-readiness-notice.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
Expand Down Expand Up @@ -3960,19 +3911,6 @@
"react": 1
}
},
"src/renderer/use-external-store-selector.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
"hookCalls": {
"useSyncExternalStore": 1
},
"lifecycleMethods": {},
"unresolvedDependencies": 0,
"actionFactories": [],
"dependencyPaths": {
"react": 1
}
},
"src/renderer/use-new-task-choice.ts": {
"bridgePaths": {},
"environmentCapabilities": {},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import { act, createElement } from 'react';
import type { StoredMessage } from '@maka/core/session';
import { cleanupFakeDom, installReactRenderer } from './fake-dom.js';
import { useAppShellSessionUiState } from '../../renderer/features/conversation/index.js';
import { createSessionCatalogController } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';

import type { LiveTurnProjection } from '@maka/ui';
import type { DesktopTranscriptRangeController } from '../../renderer/platform/desktop/desktop-transcript-range-store.js';
Expand Down Expand Up @@ -713,9 +714,10 @@ describe('composer first-send cleanup', () => {
} as unknown as DesktopTranscriptRangeController;
const { root } = installReactRenderer();
let publication!: ReturnType<typeof useAppShellSessionUiState>['publication'];
const catalog = createSessionCatalogController();
function Probe(): null {
publication = useAppShellSessionUiState(
[], undefined, deps.activeIdRef,
catalog, undefined, deps.activeIdRef,
(_sessionId, _messages, _controller: DesktopTranscriptRangeController) => true,
).publication;
return null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import {
SessionBundleServicesProvider,
SessionBundleTasks,
} from '../../renderer/features/session-bundle/index.js';
import { createSessionCatalogController } from '../../renderer/application/contracts/session-catalog/session-catalog-state.js';
import { ImportTasksSettingsPage } from '../../renderer/settings/import-tasks-settings-page.js';
import { RuntimeHostSettingsTarget } from '../../renderer/settings/runtime-host-settings-target.js';

Expand Down Expand Up @@ -911,7 +912,7 @@ async function renderPage(options: {
// own is a composition production never has.
const page = createElement(SessionBundleTasks, {
isLocalTarget: options.offersBundleSource === true,
sessions: [],
catalog: createSessionCatalogController(),
renderSection: ({ children }: { children: ReactNode }) =>
createElement('div', null, children),
children: bare,
Expand Down
Loading