@antelopejs/dms-ai 0.8.0 → 0.9.1
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/README.md +2 -1
- package/dist/lifecycle/skill-sources.js +19 -146
- package/dist/lifecycle/skill-sources.js.map +1 -1
- package/dist/pages/settings/availability.js +8 -1
- package/dist/pages/settings/availability.js.map +1 -1
- package/dist/pages/settings/options.d.ts +2 -1
- package/dist/pages/settings/options.js +29 -8
- package/dist/pages/settings/options.js.map +1 -1
- package/dist/pages/settings/sections.js +25 -4
- package/dist/pages/settings/sections.js.map +1 -1
- package/dist/routes/builder.d.ts +3 -3
- package/dist/routes/builder.js +10 -2
- package/dist/routes/builder.js.map +1 -1
- package/dist/routes/settings.js +1 -1
- package/dist/routes/settings.js.map +1 -1
- package/dist/sidecar/settings-values.d.ts +3 -0
- package/dist/sidecar/settings-values.js +33 -1
- package/dist/sidecar/settings-values.js.map +1 -1
- package/dist/vocabulary/enumerations.js +2 -0
- package/dist/vocabulary/enumerations.js.map +1 -1
- package/dist/vocabulary/tools.js +3 -0
- package/dist/vocabulary/tools.js.map +1 -1
- package/frontend-vue/app/chat/components/ChatView.vue +53 -85
- package/frontend-vue/app/chat/components/Composer.vue +23 -39
- package/frontend-vue/app/chat/components/NoticeCard.vue +25 -0
- package/frontend-vue/app/chat/components/PanelHeader.vue +2 -6
- package/frontend-vue/app/chat/components/ProviderNotice.vue +14 -3
- package/frontend-vue/app/chat/composables/conversation-events.ts +4 -3
- package/frontend-vue/app/chat/composables/useConversation.ts +6 -0
- package/frontend-vue/app/chat/composables/useConversationMode.ts +8 -11
- package/frontend-vue/app/chat/composables/useFollowScroll.ts +77 -0
- package/frontend-vue/app/chat/constants/modes.ts +15 -0
- package/frontend-vue/app/chat/constants/protocol.ts +0 -1
- package/frontend-vue/app/chat/constants/settings.ts +1 -1
- package/frontend-vue/app/chat/types/protocol.ts +19 -9
- package/frontend-vue/app/chat/types/settings.ts +7 -2
- package/frontend-vue/app/chat/utils/permission-view.ts +1 -0
- package/frontend-vue/app/chat/utils/status-label.ts +50 -0
- package/frontend-vue/app/chat/utils/tool-lexicon.ts +16 -0
- package/frontend-vue/app/plugins/ai.client.ts +2 -2
- package/frontend-vue/app/runtime/assistant-actions.ts +4 -2
- package/frontend-vue/app/runtime/assistant-session.ts +5 -1
- package/frontend-vue/app/runtime/block-health.ts +135 -0
- package/frontend-vue/app/runtime/constants.ts +1 -0
- package/frontend-vue/app/runtime/navigation-complete.ts +47 -6
- package/frontend-vue/app/runtime/panel-intents.ts +6 -2
- package/frontend-vue/app/views/constants.ts +2 -0
- package/frontend-vue/app/views/types.ts +3 -1
- package/frontend-vue/i18n/locales/dms-ai-pages-en-GB.json +28 -11
- package/frontend-vue/i18n/locales/dms-ai-pages-fr-FR.json +28 -11
- package/frontend-vue/i18n/locales/dms-ai-panel-en-GB.json +17 -22
- package/frontend-vue/i18n/locales/dms-ai-panel-fr-FR.json +17 -22
- package/frontend-vue/i18n/locales/dms-ai-views-en-GB.json +2 -0
- package/frontend-vue/i18n/locales/dms-ai-views-fr-FR.json +2 -0
- package/frontend-vue/tests/assistant-actions.test.ts +37 -0
- package/frontend-vue/tests/block-health.test.ts +142 -0
- package/frontend-vue/tests/chat/chat-scroll.test.ts +251 -0
- package/frontend-vue/tests/chat/conversation-events.test.ts +35 -3
- package/frontend-vue/tests/chat/provider-notice.test.ts +33 -0
- package/frontend-vue/tests/chat/tool-lexicon.test.ts +1 -0
- package/frontend-vue/tests/chat-panel.test.ts +2 -4
- package/frontend-vue/tests/navigation.test.ts +67 -2
- package/frontend-vue/tests/panel-modes.test.ts +146 -0
- package/frontend-vue/tests/panel-questions.test.ts +1 -19
- package/frontend-vue/tests/panel-states.test.ts +3 -15
- package/frontend-vue/tests/support/fake-layout.ts +119 -0
- package/frontend-vue/tests/support/panel-harness.ts +16 -8
- package/frontend-vue/tests/support/setup-layout.ts +3 -0
- package/frontend-vue/tests/support/stubs.ts +2 -0
- package/frontend-vue/vitest.config.ts +1 -0
- package/package.json +6 -5
- package/sidecar/dist/agent/always-ask-files.d.ts +2 -0
- package/sidecar/dist/agent/always-ask-files.js +34 -0
- package/sidecar/dist/agent/always-ask-files.js.map +1 -0
- package/sidecar/dist/agent/conversation-modes.d.ts +3 -12
- package/sidecar/dist/agent/conversation-modes.js +16 -69
- package/sidecar/dist/agent/conversation-modes.js.map +1 -1
- package/sidecar/dist/agent/effective-mode.d.ts +2 -5
- package/sidecar/dist/agent/effective-mode.js +1 -15
- package/sidecar/dist/agent/effective-mode.js.map +1 -1
- package/sidecar/dist/agent/permission-bus.d.ts +1 -2
- package/sidecar/dist/agent/permission-bus.js +1 -3
- package/sidecar/dist/agent/permission-bus.js.map +1 -1
- package/sidecar/dist/agent/permission-preview.d.ts +6 -0
- package/sidecar/dist/agent/permission-preview.js +35 -10
- package/sidecar/dist/agent/permission-preview.js.map +1 -1
- package/sidecar/dist/agent/permission-rules.js +2 -2
- package/sidecar/dist/agent/permission-rules.js.map +1 -1
- package/sidecar/dist/agent/project-secrets.d.ts +7 -0
- package/sidecar/dist/agent/project-secrets.js +61 -0
- package/sidecar/dist/agent/project-secrets.js.map +1 -0
- package/sidecar/dist/agent/provider.d.ts +10 -4
- package/sidecar/dist/agent/runner.d.ts +8 -2
- package/sidecar/dist/agent/runner.js +11 -3
- package/sidecar/dist/agent/runner.js.map +1 -1
- package/sidecar/dist/agent/session.d.ts +3 -3
- package/sidecar/dist/agent/session.js.map +1 -1
- package/sidecar/dist/agent/tool-kinds.d.ts +7 -1
- package/sidecar/dist/agent/tool-kinds.js +24 -5
- package/sidecar/dist/agent/tool-kinds.js.map +1 -1
- package/sidecar/dist/audit/activity-query.js +2 -0
- package/sidecar/dist/audit/activity-query.js.map +1 -1
- package/sidecar/dist/audit/activity.js +1 -0
- package/sidecar/dist/audit/activity.js.map +1 -1
- package/sidecar/dist/builder/builder-client.js +14 -2
- package/sidecar/dist/builder/builder-client.js.map +1 -1
- package/sidecar/dist/constants/audit.d.ts +1 -3
- package/sidecar/dist/constants/audit.js +2 -1
- package/sidecar/dist/constants/audit.js.map +1 -1
- package/sidecar/dist/constants/builder.d.ts +5 -1
- package/sidecar/dist/constants/builder.js +15 -0
- package/sidecar/dist/constants/builder.js.map +1 -1
- package/sidecar/dist/constants/claude.d.ts +8 -0
- package/sidecar/dist/constants/claude.js +8 -0
- package/sidecar/dist/constants/claude.js.map +1 -1
- package/sidecar/dist/constants/codex.d.ts +4 -0
- package/sidecar/dist/constants/codex.js +4 -0
- package/sidecar/dist/constants/codex.js.map +1 -1
- package/sidecar/dist/constants/mcp.d.ts +1 -1
- package/sidecar/dist/constants/mcp.js +1 -1
- package/sidecar/dist/constants/mcp.js.map +1 -1
- package/sidecar/dist/constants/native-binary.d.ts +5 -2
- package/sidecar/dist/constants/native-binary.js +5 -2
- package/sidecar/dist/constants/native-binary.js.map +1 -1
- package/sidecar/dist/constants/permissions.d.ts +2 -0
- package/sidecar/dist/constants/permissions.js +23 -0
- package/sidecar/dist/constants/permissions.js.map +1 -1
- package/sidecar/dist/constants/project-secrets.d.ts +5 -0
- package/sidecar/dist/constants/project-secrets.js +20 -0
- package/sidecar/dist/constants/project-secrets.js.map +1 -0
- package/sidecar/dist/constants/providers.d.ts +2 -0
- package/sidecar/dist/constants/providers.js +1 -0
- package/sidecar/dist/constants/providers.js.map +1 -1
- package/sidecar/dist/constants/settings.d.ts +2 -2
- package/sidecar/dist/constants/settings.js +4 -9
- package/sidecar/dist/constants/settings.js.map +1 -1
- package/sidecar/dist/constants/timing.d.ts +1 -0
- package/sidecar/dist/constants/timing.js +1 -0
- package/sidecar/dist/constants/timing.js.map +1 -1
- package/sidecar/dist/constants/tool-kinds.d.ts +67 -2
- package/sidecar/dist/constants/tool-kinds.js +111 -33
- package/sidecar/dist/constants/tool-kinds.js.map +1 -1
- package/sidecar/dist/mcp/tools/builder-compose.d.ts +51 -0
- package/sidecar/dist/mcp/tools/builder-compose.js +96 -0
- package/sidecar/dist/mcp/tools/builder-compose.js.map +1 -0
- package/sidecar/dist/mcp/tools/builder-gate.js +3 -1
- package/sidecar/dist/mcp/tools/builder-gate.js.map +1 -1
- package/sidecar/dist/mcp/tools/builder-project.js +119 -4
- package/sidecar/dist/mcp/tools/builder-project.js.map +1 -1
- package/sidecar/dist/mcp/tools/builder-queries.d.ts +31 -0
- package/sidecar/dist/mcp/tools/builder-queries.js +30 -13
- package/sidecar/dist/mcp/tools/builder-queries.js.map +1 -1
- package/sidecar/dist/mcp/tools/builder-table-view-schema.d.ts +99 -0
- package/sidecar/dist/mcp/tools/builder-table-view-schema.js +118 -0
- package/sidecar/dist/mcp/tools/builder-table-view-schema.js.map +1 -0
- package/sidecar/dist/mcp/tools/builder-table-view.d.ts +102 -0
- package/sidecar/dist/mcp/tools/builder-table-view.js +24 -0
- package/sidecar/dist/mcp/tools/builder-table-view.js.map +1 -0
- package/sidecar/dist/mcp/tools/builder.d.ts +135 -1
- package/sidecar/dist/mcp/tools/builder.js +17 -4
- package/sidecar/dist/mcp/tools/builder.js.map +1 -1
- package/sidecar/dist/mcp/tools/navigate-to-page.js +12 -4
- package/sidecar/dist/mcp/tools/navigate-to-page.js.map +1 -1
- package/sidecar/dist/pages/block-health.d.ts +14 -0
- package/sidecar/dist/pages/block-health.js +60 -0
- package/sidecar/dist/pages/block-health.js.map +1 -0
- package/sidecar/dist/prompts/agent.d.ts +1 -1
- package/sidecar/dist/prompts/agent.js +4 -3
- package/sidecar/dist/prompts/agent.js.map +1 -1
- package/sidecar/dist/protocol/events.d.ts +140 -63
- package/sidecar/dist/protocol/events.js +24 -8
- package/sidecar/dist/protocol/events.js.map +1 -1
- package/sidecar/dist/protocol/messages.d.ts +111 -49
- package/sidecar/dist/protocol/messages.js +30 -13
- package/sidecar/dist/protocol/messages.js.map +1 -1
- package/sidecar/dist/providers/claude/config.d.ts +19 -5
- package/sidecar/dist/providers/claude/config.js +21 -7
- package/sidecar/dist/providers/claude/config.js.map +1 -1
- package/sidecar/dist/providers/claude/model-fallback.d.ts +9 -0
- package/sidecar/dist/providers/claude/model-fallback.js +37 -0
- package/sidecar/dist/providers/claude/model-fallback.js.map +1 -0
- package/sidecar/dist/providers/claude/provider.js +35 -40
- package/sidecar/dist/providers/claude/provider.js.map +1 -1
- package/sidecar/dist/providers/claude/resolve-binary.js +18 -13
- package/sidecar/dist/providers/claude/resolve-binary.js.map +1 -1
- package/sidecar/dist/providers/claude/safe-mode.d.ts +5 -5
- package/sidecar/dist/providers/claude/safe-mode.js +49 -30
- package/sidecar/dist/providers/claude/safe-mode.js.map +1 -1
- package/sidecar/dist/providers/claude/secret-files.d.ts +2 -0
- package/sidecar/dist/providers/claude/secret-files.js +50 -0
- package/sidecar/dist/providers/claude/secret-files.js.map +1 -0
- package/sidecar/dist/providers/claude/session-stream.d.ts +18 -0
- package/sidecar/dist/providers/claude/session-stream.js +80 -0
- package/sidecar/dist/providers/claude/session-stream.js.map +1 -0
- package/sidecar/dist/providers/claude/tool-guard.d.ts +14 -0
- package/sidecar/dist/providers/claude/tool-guard.js +112 -0
- package/sidecar/dist/providers/claude/tool-guard.js.map +1 -0
- package/sidecar/dist/providers/codex/adapter.d.ts +10 -0
- package/sidecar/dist/providers/codex/adapter.js +20 -5
- package/sidecar/dist/providers/codex/adapter.js.map +1 -1
- package/sidecar/dist/providers/codex/config.d.ts +6 -17
- package/sidecar/dist/providers/codex/config.js +9 -56
- package/sidecar/dist/providers/codex/config.js.map +1 -1
- package/sidecar/dist/providers/codex/mcp-elicitation.d.ts +21 -0
- package/sidecar/dist/providers/codex/mcp-elicitation.js +66 -0
- package/sidecar/dist/providers/codex/mcp-elicitation.js.map +1 -0
- package/sidecar/dist/providers/codex/module.js +1 -1
- package/sidecar/dist/providers/codex/module.js.map +1 -1
- package/sidecar/dist/providers/codex/patch-directories.d.ts +6 -0
- package/sidecar/dist/providers/codex/patch-directories.js +53 -0
- package/sidecar/dist/providers/codex/patch-directories.js.map +1 -0
- package/sidecar/dist/providers/codex/permission-profiles.d.ts +11 -0
- package/sidecar/dist/providers/codex/permission-profiles.js +37 -0
- package/sidecar/dist/providers/codex/permission-profiles.js.map +1 -0
- package/sidecar/dist/providers/codex/permissions.d.ts +13 -4
- package/sidecar/dist/providers/codex/permissions.js +28 -2
- package/sidecar/dist/providers/codex/permissions.js.map +1 -1
- package/sidecar/dist/providers/codex/process.d.ts +1 -0
- package/sidecar/dist/providers/codex/process.js +3 -1
- package/sidecar/dist/providers/codex/process.js.map +1 -1
- package/sidecar/dist/providers/codex/protocol/common.d.ts +16 -4
- package/sidecar/dist/providers/codex/protocol/index.d.ts +2 -2
- package/sidecar/dist/providers/codex/protocol/index.js +1 -1
- package/sidecar/dist/providers/codex/protocol/index.js.map +1 -1
- package/sidecar/dist/providers/codex/protocol/v2.d.ts +23 -32
- package/sidecar/dist/providers/codex/provider.js +13 -12
- package/sidecar/dist/providers/codex/provider.js.map +1 -1
- package/sidecar/dist/providers/codex/secret-file-globs.d.ts +2 -0
- package/sidecar/dist/providers/codex/secret-file-globs.js +45 -0
- package/sidecar/dist/providers/codex/secret-file-globs.js.map +1 -0
- package/sidecar/dist/providers/types.d.ts +3 -1
- package/sidecar/dist/providers/types.js +2 -2
- package/sidecar/dist/providers/types.js.map +1 -1
- package/sidecar/dist/server/chat-events.js +1 -0
- package/sidecar/dist/server/chat-events.js.map +1 -1
- package/sidecar/dist/server/http-routes.js +1 -1
- package/sidecar/dist/server/http-routes.js.map +1 -1
- package/sidecar/dist/server/navigation-completer.d.ts +15 -2
- package/sidecar/dist/server/navigation-completer.js +42 -41
- package/sidecar/dist/server/navigation-completer.js.map +1 -1
- package/sidecar/dist/server/permission-events.d.ts +1 -1
- package/sidecar/dist/server/permission-events.js +5 -8
- package/sidecar/dist/server/permission-events.js.map +1 -1
- package/sidecar/dist/server/routing.js +11 -6
- package/sidecar/dist/server/routing.js.map +1 -1
- package/sidecar/dist/server/tool-calls.d.ts +0 -2
- package/sidecar/dist/server/tool-calls.js +7 -8
- package/sidecar/dist/server/tool-calls.js.map +1 -1
- package/sidecar/dist/server/turns.js +17 -1
- package/sidecar/dist/server/turns.js.map +1 -1
- package/sidecar/dist/server/ws.js +4 -15
- package/sidecar/dist/server/ws.js.map +1 -1
- package/sidecar/dist/skills/skill-usage.js +2 -2
- package/sidecar/dist/skills/skill-usage.js.map +1 -1
- package/sidecar/dist/state/conversations.d.ts +1 -0
- package/sidecar/dist/state/conversations.js +8 -0
- package/sidecar/dist/state/conversations.js.map +1 -1
- package/sidecar/dist/state/settings-store.d.ts +14 -5
- package/sidecar/dist/state/settings-store.js +34 -8
- package/sidecar/dist/state/settings-store.js.map +1 -1
- package/sidecar/dist/state/settings-types.d.ts +16 -2
- package/sidecar/dist/state/settings-types.js +14 -1
- package/sidecar/dist/state/settings-types.js.map +1 -1
- package/sidecar/dist/state/types.d.ts +14 -6
- package/sidecar/dist/state/types.js.map +1 -1
- package/sidecar/package.json +3 -3
- package/skills/dms-ai/SKILL.md +2 -1
- package/skills/dms-builder-safe/REFERENCE.md +5 -6
- package/skills/dms-builder-safe/SKILL.md +12 -10
- package/skills/dms-external-database/REFERENCE.md +20 -8
- package/skills/dms-external-database/SKILL.md +69 -20
- package/skills/dms-page-design/SKILL.md +192 -0
- package/skills/dms-page-design/cases.json +57 -0
- package/frontend-vue/app/chat/components/FullAutoBanner.vue +0 -76
- package/frontend-vue/app/chat/components/FullAutoDialog.vue +0 -103
|
@@ -135,8 +135,24 @@ function buildRunnerContext(services, request) {
|
|
|
135
135
|
await services.turns.get(conversationId)?.checkpoint.ready();
|
|
136
136
|
},
|
|
137
137
|
onTokenUsage: (usage) => addTurnUsage(services, conversationId, usage),
|
|
138
|
+
onModelUsed: (model) => services.conversationStore.markModel(conversationId, model),
|
|
139
|
+
onModelFallback: ({ requested, used }) => emitNotice(services, conversationId, {
|
|
140
|
+
kind: "model_fallback",
|
|
141
|
+
requestedModel: requested,
|
|
142
|
+
usedModel: used,
|
|
143
|
+
timestampMs: Date.now(),
|
|
144
|
+
}),
|
|
145
|
+
onAutoRefused: (model) => fallBackToAskFirst(services, conversationId, model),
|
|
138
146
|
};
|
|
139
147
|
}
|
|
148
|
+
function fallBackToAskFirst(services, conversationId, model) {
|
|
149
|
+
services.conversationModes.update(conversationId, { mode: "normal" });
|
|
150
|
+
emitNotice(services, conversationId, {
|
|
151
|
+
kind: "auto_unavailable",
|
|
152
|
+
model,
|
|
153
|
+
timestampMs: Date.now(),
|
|
154
|
+
});
|
|
155
|
+
}
|
|
140
156
|
function beginTurn(services, request) {
|
|
141
157
|
const { conversationId } = request;
|
|
142
158
|
services.liveTurns.begin(conversationId);
|
|
@@ -215,6 +231,7 @@ function recordUsage(services, conversationId) {
|
|
|
215
231
|
type: EVENT_TYPES.USAGE,
|
|
216
232
|
conversationId,
|
|
217
233
|
totalTokens: total,
|
|
234
|
+
model: services.conversationStore.get(conversationId)?.model,
|
|
218
235
|
});
|
|
219
236
|
}
|
|
220
237
|
async function finishTurn(services, conversationId) {
|
|
@@ -226,7 +243,6 @@ async function finishTurn(services, conversationId) {
|
|
|
226
243
|
finally {
|
|
227
244
|
recordUsage(services, conversationId);
|
|
228
245
|
services.turns.end(conversationId);
|
|
229
|
-
services.conversationModes.endTurn(conversationId);
|
|
230
246
|
broadcastConversationList(services);
|
|
231
247
|
}
|
|
232
248
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"turns.js","sourceRoot":"","sources":["../../src/server/turns.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"turns.js","sourceRoot":"","sources":["../../src/server/turns.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ import { WS_CLIENT_CLOSE_GRACE_MS, WS_GOING_AWAY_CODE, WS_LOG_PREFIX, WS_PATH, }
|
|
|
17
17
|
import { createAiMcpServer } from "../mcp/sdk-binding.js";
|
|
18
18
|
import { PROVIDER_MODULES } from "../providers/registry.js";
|
|
19
19
|
import { createChangeSetStore } from "../state/change-sets.js";
|
|
20
|
-
import { broadcastConversationList, emitBlockPreview,
|
|
20
|
+
import { broadcastConversationList, emitBlockPreview, listAttachedImages, sendConversationMode, } from "./chat-events.js";
|
|
21
21
|
import { isClientAuthorized } from "./client-auth.js";
|
|
22
22
|
import { createHostCommandRouter, } from "./host-command-router.js";
|
|
23
23
|
import { createChatSocketRegistry, } from "./chat-socket-registry.js";
|
|
@@ -147,7 +147,7 @@ function buildPermissionBus(options, holder) {
|
|
|
147
147
|
if (options.permissionBus !== undefined)
|
|
148
148
|
return options.permissionBus;
|
|
149
149
|
return createPermissionBus({
|
|
150
|
-
getPolicy: (
|
|
150
|
+
getPolicy: () => permissionPolicy(services(holder)),
|
|
151
151
|
onPromptChat: (request) => onPermissionPrompt(services(holder), request),
|
|
152
152
|
onDecided: (record) => onPermissionDecided(services(holder), record),
|
|
153
153
|
onRulesChanged: (conversationId) => onRulesChanged(services(holder), conversationId),
|
|
@@ -168,23 +168,12 @@ function createDisabledCheckpoints() {
|
|
|
168
168
|
store: createChangeSetStore(""),
|
|
169
169
|
});
|
|
170
170
|
}
|
|
171
|
-
function onModeChanged(holder, conversationId
|
|
171
|
+
function onModeChanged(holder, conversationId) {
|
|
172
172
|
const current = services(holder);
|
|
173
173
|
current.runner.refreshSession(conversationId);
|
|
174
|
-
if (hasFullAutoEnded) {
|
|
175
|
-
emitNoticeSafely(current, conversationId);
|
|
176
|
-
}
|
|
177
174
|
sendConversationMode(current, conversationId);
|
|
178
175
|
broadcastConversationList(current);
|
|
179
176
|
}
|
|
180
|
-
function emitNoticeSafely(current, conversationId) {
|
|
181
|
-
if (current.conversationStore.get(conversationId) === null)
|
|
182
|
-
return;
|
|
183
|
-
emitNotice(current, conversationId, {
|
|
184
|
-
kind: "full_auto_ended",
|
|
185
|
-
timestampMs: Date.now(),
|
|
186
|
-
});
|
|
187
|
-
}
|
|
188
177
|
function buildServices(parts) {
|
|
189
178
|
const { options, holder, chatSocketRegistry, settingsStore } = parts;
|
|
190
179
|
const createMcpDeps = buildMcpDepsFactory(options.mcpDeps, holder, createHostCommandRouter(options.hostSocketRegistry, chatSocketRegistry));
|
|
@@ -209,7 +198,7 @@ function buildServices(parts) {
|
|
|
209
198
|
conversationModes: createConversationModes({
|
|
210
199
|
conversationStore: options.conversationStore,
|
|
211
200
|
settingsStore,
|
|
212
|
-
onChanged: (conversationId
|
|
201
|
+
onChanged: (conversationId) => onModeChanged(holder, conversationId),
|
|
213
202
|
}),
|
|
214
203
|
checkpoints: options.checkpoints ?? createDisabledCheckpoints(),
|
|
215
204
|
callAudit: createCallAudit(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/server/ws.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ws.js","sourceRoot":"","sources":["../../src/server/ws.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod";
|
|
2
|
-
import { bareToolName,
|
|
2
|
+
import { bareToolName, isBashTool } from "../agent/tool-kinds.js";
|
|
3
3
|
import { parseArgs } from "../audit/activity-target.js";
|
|
4
4
|
import { SKILL_FILE_NAME, SKILL_TOOL_ARG_KEYS, SKILL_TOOL_NAME, } from "../constants/tool-kinds.js";
|
|
5
5
|
import { LOCAL_SKILLS_PROVENANCE } from "./resolve-sources.js";
|
|
@@ -35,7 +35,7 @@ function usedSkill(message, names) {
|
|
|
35
35
|
const args = parseArgs(message.content);
|
|
36
36
|
if (toolName === SKILL_TOOL_NAME)
|
|
37
37
|
return skillToolName(args);
|
|
38
|
-
if (
|
|
38
|
+
if (isBashTool(toolName))
|
|
39
39
|
return skillFileRead(args, names);
|
|
40
40
|
return undefined;
|
|
41
41
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"skill-usage.js","sourceRoot":"","sources":["../../src/skills/skill-usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"skill-usage.js","sourceRoot":"","sources":["../../src/skills/skill-usage.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ export interface ConversationStore {
|
|
|
20
20
|
appendMessage(conversationId: string, message: StoredMessage): void;
|
|
21
21
|
patchMessages(conversationId: string, matches: (message: StoredMessage) => boolean, patch: StoredMessagePatch): void;
|
|
22
22
|
markProvider(conversationId: string, provider: ProviderName): void;
|
|
23
|
+
markModel(conversationId: string, model: string): void;
|
|
23
24
|
addTokenUsage(conversationId: string, usage: TokenUsage): void;
|
|
24
25
|
recordTurnUsage(conversationId: string, usage: TokenUsage, timestampMs: number): void;
|
|
25
26
|
setModes(conversationId: string, patch: ConversationModesPatch): void;
|
|
@@ -52,6 +52,13 @@ function markProvider(state, conversationId, provider) {
|
|
|
52
52
|
conversation.provider = provider;
|
|
53
53
|
persistCache(state);
|
|
54
54
|
}
|
|
55
|
+
function markModel(state, conversationId, model) {
|
|
56
|
+
const conversation = ensureConversation(state, conversationId);
|
|
57
|
+
if (conversation.model === model)
|
|
58
|
+
return;
|
|
59
|
+
conversation.model = model;
|
|
60
|
+
persistCache(state);
|
|
61
|
+
}
|
|
55
62
|
function sumUsage(current, usage) {
|
|
56
63
|
return {
|
|
57
64
|
inputTokens: current.inputTokens + usage.inputTokens,
|
|
@@ -141,6 +148,7 @@ export function createConversationStore(options) {
|
|
|
141
148
|
appendMessage: (id, message) => appendToConversation(state, id, message),
|
|
142
149
|
patchMessages: (id, matches, patch) => patchMessages(state, id, matches, patch),
|
|
143
150
|
markProvider: (id, provider) => markProvider(state, id, provider),
|
|
151
|
+
markModel: (id, model) => markModel(state, id, model),
|
|
144
152
|
addTokenUsage: (id, usage) => addTokenUsage(state, id, usage),
|
|
145
153
|
recordTurnUsage: (id, usage, timestampMs) => recordTurnUsage(state, id, usage, timestampMs),
|
|
146
154
|
setModes: (id, patch) => setModes(state, id, patch),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conversations.js","sourceRoot":"","sources":["../../src/state/conversations.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,iBAAiB,GAOlB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"conversations.js","sourceRoot":"","sources":["../../src/state/conversations.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,17 +14,13 @@ declare const StoredSettingsSchema: z.ZodObject<{
|
|
|
14
14
|
claude: "claude";
|
|
15
15
|
codex: "codex";
|
|
16
16
|
}>>>>;
|
|
17
|
-
mode: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodEnum<{
|
|
18
|
-
normal: "normal";
|
|
19
|
-
acceptEdits: "acceptEdits";
|
|
20
|
-
plan: "plan";
|
|
21
|
-
}>>>>;
|
|
22
17
|
thinking: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodEnum<{
|
|
23
18
|
off: "off";
|
|
24
19
|
low: "low";
|
|
25
20
|
medium: "medium";
|
|
26
21
|
high: "high";
|
|
27
22
|
}>>>>;
|
|
23
|
+
claudeModel: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodString>>>;
|
|
28
24
|
generationMode: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodEnum<{
|
|
29
25
|
safe: "safe";
|
|
30
26
|
vibe: "vibe";
|
|
@@ -35,6 +31,19 @@ declare const StoredSettingsSchema: z.ZodObject<{
|
|
|
35
31
|
requestTimeoutMinutes: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodLiteral<5 | 15 | 30>>>>;
|
|
36
32
|
notifyRequests: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodBoolean>>>;
|
|
37
33
|
checkpointRetentionDays: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodLiteral<7 | 30 | 90>>>>;
|
|
34
|
+
defaultModes: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodObject<{
|
|
35
|
+
claude: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodEnum<{
|
|
36
|
+
normal: "normal";
|
|
37
|
+
auto: "auto";
|
|
38
|
+
acceptEdits: "acceptEdits";
|
|
39
|
+
plan: "plan";
|
|
40
|
+
}>>>>;
|
|
41
|
+
codex: z.ZodCatch<z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodEnum<{
|
|
42
|
+
normal: "normal";
|
|
43
|
+
acceptEdits: "acceptEdits";
|
|
44
|
+
plan: "plan";
|
|
45
|
+
}>>>>;
|
|
46
|
+
}, z.core.$strip>>>>;
|
|
38
47
|
}, z.core.$strip>;
|
|
39
48
|
type SettingsPatchInput = z.input<typeof StoredSettingsSchema>;
|
|
40
49
|
export declare function mergeSettings(current: AppSettings, patch: SettingsPatchInput): AppSettings;
|
|
@@ -3,15 +3,15 @@ import { dirname } from "node:path";
|
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import { DEFAULT_SETTINGS, SETTINGS_LOG_PREFIX, } from "../constants/settings.js";
|
|
5
5
|
import { STATE_FILE_ENCODING, STATE_JSON_INDENT } from "../constants/state.js";
|
|
6
|
-
import { CHAT_MODES, CHECKPOINT_RETENTION_DAYS, GENERATION_MODES, REQUEST_TIMEOUT_MINUTES, THINKING_LEVELS, } from "./settings-types.js";
|
|
6
|
+
import { CHAT_MODES, CHECKPOINT_RETENTION_DAYS, CODEX_CHAT_MODES, GENERATION_MODES, REQUEST_TIMEOUT_MINUTES, THINKING_LEVELS, } from "./settings-types.js";
|
|
7
7
|
import { PROVIDER_NAMES } from "./types.js";
|
|
8
8
|
function lenient(schema) {
|
|
9
9
|
return z.unknown().pipe(schema).optional().catch(undefined);
|
|
10
10
|
}
|
|
11
|
-
const
|
|
11
|
+
const FlatSettingsSchema = z.object({
|
|
12
12
|
provider: lenient(z.enum(PROVIDER_NAMES)),
|
|
13
|
-
mode: lenient(z.enum(CHAT_MODES)),
|
|
14
13
|
thinking: lenient(z.enum(THINKING_LEVELS)),
|
|
14
|
+
claudeModel: lenient(z.string().trim().min(1)),
|
|
15
15
|
generationMode: lenient(z.enum(GENERATION_MODES)),
|
|
16
16
|
allowLocalSkills: lenient(z.boolean()),
|
|
17
17
|
alwaysAskDependencies: lenient(z.boolean()),
|
|
@@ -20,23 +20,49 @@ const StoredSettingsSchema = z.object({
|
|
|
20
20
|
notifyRequests: lenient(z.boolean()),
|
|
21
21
|
checkpointRetentionDays: lenient(z.literal(CHECKPOINT_RETENTION_DAYS)),
|
|
22
22
|
});
|
|
23
|
-
const
|
|
23
|
+
const StoredSettingsSchema = FlatSettingsSchema.extend({
|
|
24
|
+
defaultModes: lenient(z.object({
|
|
25
|
+
claude: lenient(z.enum(CHAT_MODES)),
|
|
26
|
+
codex: lenient(z.enum(CODEX_CHAT_MODES)),
|
|
27
|
+
})),
|
|
28
|
+
});
|
|
29
|
+
const FLAT_SETTINGS_KEYS = FlatSettingsSchema.keyof().options;
|
|
30
|
+
const LegacySettingsSchema = z.object({ mode: lenient(z.enum(CHAT_MODES)) });
|
|
31
|
+
const LEGACY_MODE_SEEDS = {
|
|
32
|
+
normal: { claude: DEFAULT_SETTINGS.defaultModes.claude, codex: "normal" },
|
|
33
|
+
auto: { claude: "normal", codex: "normal" },
|
|
34
|
+
acceptEdits: { claude: "acceptEdits", codex: "acceptEdits" },
|
|
35
|
+
plan: { claude: "plan", codex: "plan" },
|
|
36
|
+
};
|
|
24
37
|
export function mergeSettings(current, patch) {
|
|
25
38
|
const accepted = StoredSettingsSchema.parse(patch);
|
|
26
|
-
const merged = {
|
|
27
|
-
|
|
39
|
+
const merged = {
|
|
40
|
+
...current,
|
|
41
|
+
defaultModes: {
|
|
42
|
+
claude: accepted.defaultModes?.claude ?? current.defaultModes.claude,
|
|
43
|
+
codex: accepted.defaultModes?.codex ?? current.defaultModes.codex,
|
|
44
|
+
},
|
|
45
|
+
};
|
|
46
|
+
for (const key of FLAT_SETTINGS_KEYS) {
|
|
28
47
|
const value = accepted[key];
|
|
29
48
|
if (value !== undefined)
|
|
30
49
|
Object.assign(merged, { [key]: value });
|
|
31
50
|
}
|
|
32
51
|
return merged;
|
|
33
52
|
}
|
|
53
|
+
function storedDefaults(legacy) {
|
|
54
|
+
if (legacy === undefined)
|
|
55
|
+
return DEFAULT_SETTINGS;
|
|
56
|
+
return { ...DEFAULT_SETTINGS, defaultModes: LEGACY_MODE_SEEDS[legacy] };
|
|
57
|
+
}
|
|
34
58
|
export function parseSettings(raw) {
|
|
35
59
|
try {
|
|
36
|
-
const
|
|
60
|
+
const stored = JSON.parse(raw);
|
|
61
|
+
const parsed = StoredSettingsSchema.safeParse(stored);
|
|
37
62
|
if (!parsed.success)
|
|
38
63
|
return DEFAULT_SETTINGS;
|
|
39
|
-
|
|
64
|
+
const legacy = LegacySettingsSchema.safeParse(stored).data?.mode;
|
|
65
|
+
return mergeSettings(storedDefaults(legacy), parsed.data);
|
|
40
66
|
}
|
|
41
67
|
catch {
|
|
42
68
|
return DEFAULT_SETTINGS;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-store.js","sourceRoot":"","sources":["../../src/state/settings-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EACL,gBAAgB,EAChB,mBAAmB,GACpB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC/E,OAAO,EAEL,UAAU,
|
|
1
|
+
{"version":3,"file":"settings-store.js","sourceRoot":"","sources":["../../src/state/settings-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,16 @@
|
|
|
1
1
|
import type { ProviderName } from "./types.js";
|
|
2
|
-
export declare const CHAT_MODES: readonly ["normal", "acceptEdits", "plan"];
|
|
2
|
+
export declare const CHAT_MODES: readonly ["normal", "auto", "acceptEdits", "plan"];
|
|
3
3
|
export type ChatMode = (typeof CHAT_MODES)[number];
|
|
4
|
+
export declare const CODEX_CHAT_MODES: readonly ["normal", "acceptEdits", "plan"];
|
|
5
|
+
export type CodexChatMode = (typeof CODEX_CHAT_MODES)[number];
|
|
6
|
+
declare const PROVIDER_CHAT_MODES: {
|
|
7
|
+
readonly claude: readonly ["normal", "auto", "acceptEdits", "plan"];
|
|
8
|
+
readonly codex: readonly ["normal", "acceptEdits", "plan"];
|
|
9
|
+
};
|
|
10
|
+
export declare function modeForProvider(provider: ProviderName, mode: ChatMode): ChatMode;
|
|
11
|
+
export type DefaultModes = {
|
|
12
|
+
[P in ProviderName]: (typeof PROVIDER_CHAT_MODES)[P][number];
|
|
13
|
+
};
|
|
4
14
|
export declare const THINKING_LEVELS: readonly ["off", "low", "medium", "high"];
|
|
5
15
|
export type ThinkingLevel = (typeof THINKING_LEVELS)[number];
|
|
6
16
|
export declare const GENERATION_MODES: readonly ["safe", "vibe"];
|
|
@@ -11,8 +21,9 @@ export declare const CHECKPOINT_RETENTION_DAYS: readonly [7, 30, 90];
|
|
|
11
21
|
type CheckpointRetentionDays = (typeof CHECKPOINT_RETENTION_DAYS)[number];
|
|
12
22
|
export interface AppSettings {
|
|
13
23
|
provider: ProviderName;
|
|
14
|
-
|
|
24
|
+
defaultModes: DefaultModes;
|
|
15
25
|
thinking: ThinkingLevel;
|
|
26
|
+
claudeModel: string;
|
|
16
27
|
generationMode: GenerationMode;
|
|
17
28
|
allowLocalSkills: boolean;
|
|
18
29
|
alwaysAskDependencies: boolean;
|
|
@@ -21,4 +32,7 @@ export interface AppSettings {
|
|
|
21
32
|
notifyRequests: boolean;
|
|
22
33
|
checkpointRetentionDays: CheckpointRetentionDays;
|
|
23
34
|
}
|
|
35
|
+
export interface TurnSettings extends AppSettings {
|
|
36
|
+
mode: ChatMode;
|
|
37
|
+
}
|
|
24
38
|
export {};
|
|
@@ -1,4 +1,17 @@
|
|
|
1
|
-
export const CHAT_MODES = ["normal", "acceptEdits", "plan"];
|
|
1
|
+
export const CHAT_MODES = ["normal", "auto", "acceptEdits", "plan"];
|
|
2
|
+
export const CODEX_CHAT_MODES = [
|
|
3
|
+
"normal",
|
|
4
|
+
"acceptEdits",
|
|
5
|
+
"plan",
|
|
6
|
+
];
|
|
7
|
+
const PROVIDER_CHAT_MODES = {
|
|
8
|
+
claude: CHAT_MODES,
|
|
9
|
+
codex: CODEX_CHAT_MODES,
|
|
10
|
+
};
|
|
11
|
+
export function modeForProvider(provider, mode) {
|
|
12
|
+
const modes = PROVIDER_CHAT_MODES[provider];
|
|
13
|
+
return modes.includes(mode) ? mode : "normal";
|
|
14
|
+
}
|
|
2
15
|
export const THINKING_LEVELS = ["off", "low", "medium", "high"];
|
|
3
16
|
export const GENERATION_MODES = ["safe", "vibe"];
|
|
4
17
|
export const REQUEST_TIMEOUT_MINUTES = [5, 15, 30];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"settings-types.js","sourceRoot":"","sources":["../../src/state/settings-types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"settings-types.js","sourceRoot":"","sources":["../../src/state/settings-types.ts"],"names":[],"mappings":"AAaA,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAU,CAAC;AAG7E,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,QAAQ;IACR,aAAa;IACb,MAAM;CACgC,CAAC;AAGzC,MAAM,mBAAmB,GAAG;IAC1B,MAAM,EAAE,UAAU;IAClB,KAAK,EAAE,gBAAgB;CACqC,CAAC;AAM/D,MAAM,UAAU,eAAe,CAC7B,QAAsB,EACtB,IAAc;IAEd,MAAM,KAAK,GAAwB,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACjE,OAAO,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC;AAChD,CAAC;AAMD,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAC;AAQzE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAM,EAAE,MAAM,CAAU,CAAC;AAG1D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAU,CAAC;AAG5D,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,CAAU,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AllowedBy, ChangeFileStatus, ChangeSetState,
|
|
1
|
+
import type { AllowedBy, ChangeFileStatus, ChangeSetState, PermissionKind, ToolOutcome, TypecheckOutcome } from "../constants/audit.js";
|
|
2
2
|
import type { BlockPreviewType } from "../protocol/preview.js";
|
|
3
3
|
import type { ChatMode, GenerationMode } from "./settings-types.js";
|
|
4
4
|
declare const STORED_MESSAGE_ROLES: readonly ["user", "assistant", "tool_use", "tool_result", "permission", "error", "notice", "change_set", "question_answer", "block_preview"];
|
|
@@ -34,7 +34,18 @@ export interface FullAutoEndedNotice {
|
|
|
34
34
|
kind: "full_auto_ended";
|
|
35
35
|
timestampMs: number;
|
|
36
36
|
}
|
|
37
|
-
export
|
|
37
|
+
export interface ModelFallbackNotice {
|
|
38
|
+
kind: "model_fallback";
|
|
39
|
+
requestedModel: string;
|
|
40
|
+
usedModel: string;
|
|
41
|
+
timestampMs: number;
|
|
42
|
+
}
|
|
43
|
+
export interface AutoUnavailableNotice {
|
|
44
|
+
kind: "auto_unavailable";
|
|
45
|
+
model: string;
|
|
46
|
+
timestampMs: number;
|
|
47
|
+
}
|
|
48
|
+
export type Notice = AutoFixNotice | PermissionExpiredNotice | QuestionSkippedNotice | FullAutoEndedNotice | ModelFallbackNotice | AutoUnavailableNotice;
|
|
38
49
|
export interface QuestionAnswerRecord {
|
|
39
50
|
header: string;
|
|
40
51
|
question: string;
|
|
@@ -87,6 +98,7 @@ export interface StoredConversation {
|
|
|
87
98
|
updatedAtMs: number;
|
|
88
99
|
provider?: ProviderName;
|
|
89
100
|
tokenUsage?: TokenUsage;
|
|
101
|
+
model?: string;
|
|
90
102
|
usageLog?: UsageEntry[];
|
|
91
103
|
mode?: ChatMode;
|
|
92
104
|
generationMode?: GenerationMode;
|
|
@@ -111,10 +123,6 @@ export interface ConversationSummary extends StoredConversationSummary {
|
|
|
111
123
|
pendingQuestions: number;
|
|
112
124
|
generationMode: GenerationMode;
|
|
113
125
|
}
|
|
114
|
-
export interface FullAutoState {
|
|
115
|
-
duration: FullAutoDuration;
|
|
116
|
-
untilMs?: number;
|
|
117
|
-
}
|
|
118
126
|
export interface ChangeSetFile {
|
|
119
127
|
path: string;
|
|
120
128
|
status: ChangeFileStatus;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/state/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/state/types.ts"],"names":[],"mappings":"AA4BA,MAAM,oBAAoB,GAAG;IAC3B,MAAM;IACN,WAAW;IACX,UAAU;IACV,aAAa;IACb,YAAY;IACZ,OAAO;IACP,QAAQ;IACR,YAAY;IACZ,iBAAiB;IACjB,eAAe;CACP,CAAC;AAIX,MAAM,uBAAuB,GAAG,CAAC,SAAS,EAAE,OAAO,CAAU,CAAC;AAQ9D,MAAM,2BAA2B,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAU,CAAC;AA6GpE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAU,CAAC;AAG3D,MAAM,CAAC,MAAM,qBAAqB,GAAiB,cAAc,CAAC,CAAC,CAAC,CAAC;AAYrE,MAAM,CAAC,MAAM,iBAAiB,GAAe;IAC3C,WAAW,EAAE,CAAC;IACd,YAAY,EAAE,CAAC;IACf,WAAW,EAAE,CAAC;CACf,CAAC"}
|
package/sidecar/package.json
CHANGED
|
@@ -19,15 +19,15 @@
|
|
|
19
19
|
"knip:all": "knip"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@anthropic-ai/claude-agent-sdk": "^0.
|
|
23
|
-
"@anthropic-ai/claude-code": "^2.1.
|
|
22
|
+
"@anthropic-ai/claude-agent-sdk": "^0.3.316",
|
|
23
|
+
"@anthropic-ai/claude-code": "^2.1.316",
|
|
24
24
|
"@modelcontextprotocol/sdk": "1.29.0",
|
|
25
25
|
"ws": "^8.18.0",
|
|
26
26
|
"zod": "^4.0.0"
|
|
27
27
|
},
|
|
28
28
|
"devDependencies": {
|
|
29
29
|
"@antelopejs/tooling-configs": "^0.2.11",
|
|
30
|
-
"@openai/codex": "0.
|
|
30
|
+
"@openai/codex": "0.166.0",
|
|
31
31
|
"@types/node": "^22.19.15",
|
|
32
32
|
"@types/ws": "^8.5.12",
|
|
33
33
|
"knip": "^6.34.0",
|
package/skills/dms-ai/SKILL.md
CHANGED
|
@@ -27,5 +27,6 @@ The sidecar loads every directory a loaded module declares in `package.json` `an
|
|
|
27
27
|
- Overview and Activity open with the DMS `PageToolbar` (period only, no live: "updated" + refresh); their selectors share `rememberKey: "ai"`. The Overview offers previous period / previous year / none in a menu (`comparisonControl: "menu"`); its KPI, series, allowed and top-tools routes forward `compareFrom` / `compareTo` (absent under none); the top lists carry a per-row `delta`. `/ai/activity` filters on the `from` / `to` the table sends; the CSV export ignores them.
|
|
28
28
|
- Offline assistant: Restart on the Overview; lists and settings answer `503` while the sidecar is down.
|
|
29
29
|
- Remote over plain HTTP: start the frontend with `DMS_COOKIE_SECURE=false`.
|
|
30
|
-
- Deleting pages, tables, fields or queries asks in every mode,
|
|
30
|
+
- Deleting pages, tables, fields or queries asks in every mode, Auto review included. So does a database mapping that would remove a page, and so does every edit of a git hook file (anything inside a `.git` directory, `.husky/*`, a lefthook config file, `.pre-commit-config.yaml`), whatever the dependencies toggle says. With Codex, the sandbox is read-only in every mode, so every write asks, and the card for such a file offers no rule.
|
|
31
|
+
- Claude Code defaults to Auto review (a safety check approves routine file edits and web access); every shell command, scheduled task and tool it does not know still asks the person, and so does every edit of `package.json`, a lockfile, `pnpm-workspace.yaml`, `.npmrc`, `.pnpmfile.cjs`, `.yarnrc`, `.yarnrc.yml` or `bunfig.toml` unless the person turned off the dependency approval. Codex defaults to Ask first and has no Auto review. Ask first asks before every command, read-only ones included, and before any change outside the Builder. Accept edits applies file edits unasked, except dependency and git hook files, and asks before every command; with Codex it works as Ask first, asking before every file edit and any command that writes.
|
|
31
32
|
- Undo is limited to the checkpoint retention (7, 30 or 90 days).
|
|
@@ -43,16 +43,15 @@ resource, then `BuilderAddBlock` a `TableView` with `controller` = the resource
|
|
|
43
43
|
and display options in `config`. Relation columns work via `$ref` (see
|
|
44
44
|
"DataType, component, and reference values" in SKILL.md).
|
|
45
45
|
|
|
46
|
-
## Queries (computed
|
|
46
|
+
## Queries (computed data a DataAPI can't serve)
|
|
47
47
|
|
|
48
|
-
A **query** is a derived-data endpoint on a *page*: a GET route
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
whenever a block needs a number rather than a list — a **KpiCard** is the usual consumer.
|
|
48
|
+
A **query** is a derived-data endpoint on a *page*: a GET route serving an aggregate or one
|
|
49
|
+
point per group, backed by a generated method on the resource's model. The DataAPI serves
|
|
50
|
+
rows; a query serves what a KPI card, a chart or a ranked list reads.
|
|
52
51
|
|
|
53
52
|
1. **Read the templates.** `BuilderQueryTemplates` returns each template's `id`, what it
|
|
54
53
|
computes, its `output` kind, and its `params` schema. Never guess an id or a param key —
|
|
55
|
-
an unrecognised key is rejected.
|
|
54
|
+
an unrecognised key is rejected.
|
|
56
55
|
2. **Add the query** with `BuilderAddQuery` on the page that will display it (not the
|
|
57
56
|
resource's page). It compiles the template into a model method and a page route in one
|
|
58
57
|
atomic op and returns `{ query, route }`.
|