libre-webui 0.36.0 → 0.37.1

package/backend/dist/services/titleGenerationService.js

@@ -14,8 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { normalizeChatProviderSelection, } from '../utils/chatProviderSelection.js';
+import { ChatProviderSelectionError, normalizeChatProviderSelection, } from '../utils/chatProviderSelection.js';
 export const AUTO_TITLE_CURRENT_MODEL = '__current_running_model__';
+export const generateNativeDshText = async (input) => {
+    const { nativeDshProviderService } = await import('../cordis/dsh/native-provider-client.js');
+    return nativeDshProviderService.text(input);
+};
+/** Resolve text calls without creating an agent session or invoking tools. */
+export const resolveDshAuxiliaryTarget = async (model, userId) => {
+    const { resolveDshProviderTarget } = await import('../cordis/dsh/chat-model.js');
+    return resolveDshProviderTarget(model, userId);
+};
 const TITLE_GENERATION_OPTIONS = {
     temperature: 0.3,
     num_predict: 20,
@@ -93,16 +102,20 @@ export function sanitizeGeneratedTitle(rawTitle, sourceMessage) {
     return sanitizeGeneratedTitleResult(rawTitle, sourceMessage).title;
 }
 export class TitleGenerationService {
-    constructor({ chatService, chatGenerationService, pluginService, ollamaService, now = Date.now, logger = console, }) {
+    constructor({ chatService, chatGenerationService, pluginService, ollamaService, now = Date.now, logger = console, resolveDshProviderTarget = resolveDshAuxiliaryTarget, generateDshText = generateNativeDshText, }) {
         this.chatService = chatService;
         this.chatGenerationService = chatGenerationService;
         this.pluginService = pluginService;
         this.ollamaService = ollamaService;
         this.now = now;
         this.logger = logger;
+        this.resolveDshProviderTarget = resolveDshProviderTarget;
+        this.generateDshText = generateDshText;
     }
     async resolveTitleGenerationModel(requestedModel, session, userId) {
         if (requestedModel === AUTO_TITLE_CURRENT_MODEL) {
+            if (session.providerType === 'agent')
+                return session.model;
             return this.chatGenerationService.resolveActualModelName(session.model, userId);
         }
         return requestedModel;
@@ -112,18 +125,53 @@ export class TitleGenerationService {
         if (!session) {
             return null;
         }
-        const model = await this.resolveTitleGenerationModel(requestedModel, session, userId);
-        const providerSelection = requestedModel === AUTO_TITLE_CURRENT_MODEL
+        let providerSelection = requestedModel === AUTO_TITLE_CURRENT_MODEL
             ? // A persona session's binding points at the pseudo-model; the
                 // resolved backing model finds its own provider by name.
-                session.model.startsWith('persona:')
+                session.model.startsWith('persona:') &&
+                    session.providerType !== 'agent'
                     ? undefined
                     : normalizeChatProviderSelection(session)
             : normalizeChatProviderSelection({ providerType, providerId });
+        if (requestedModel.startsWith('persona:') &&
+            providerSelection?.providerType !== 'agent') {
+            // Task personas carry the same synthetic binding as Chat personas.
+            // Their backing model owns provider resolution, including plugin routes.
+            providerSelection = undefined;
+        }
+        const usesDsh = providerSelection?.providerType === 'agent' &&
+            providerSelection.providerId === 'dsh';
+        if (providerSelection?.providerType === 'agent' && !usesDsh) {
+            throw new ChatProviderSelectionError('Title generation requires an Ollama, plugin, or DeepSeek Harness model.');
+        }
+        let model = await this.resolveTitleGenerationModel(requestedModel, session, userId);
         let title = buildFallbackTitle(message);
         let source = 'fallback';
         try {
-            const generation = await this.generateTitleWithModel(sessionId, model, message, userId, providerSelection);
+            let nativeProviderId;
+            if (usesDsh) {
+                const resolved = await this.resolveDshProviderTarget(model, userId);
+                model = resolved.model;
+                if (resolved.providerType === 'dsh') {
+                    if (!resolved.providerId)
+                        throw new Error('Native DSH provider identity is missing.');
+                    nativeProviderId = resolved.providerId;
+                }
+                else
+                    providerSelection = normalizeChatProviderSelection(resolved);
+            }
+            const generation = nativeProviderId
+                ? {
+                    title: await this.generateDshText({
+                        model,
+                        providerId: nativeProviderId,
+                        userId,
+                        prompt: buildTitlePrompt(message),
+                        purpose: 'session-title',
+                    }),
+                    source: 'dsh',
+                }
+                : await this.generateTitleWithModel(sessionId, model, message, userId, providerSelection);
             const sanitizedTitle = sanitizeGeneratedTitleResult(generation.title, message);
             title = sanitizedTitle.title;
             source = sanitizedTitle.usedFallback ? 'fallback' : generation.source;
@@ -144,6 +192,13 @@ export class TitleGenerationService {
     }
     async generateTitleWithModel(sessionId, model, message, userId, providerSelection) {
         const target = await this.chatGenerationService.prepareGenerationTarget(model, userId, TITLE_GENERATION_OPTIONS, providerSelection);
+        if (target.providerType === 'agent' ||
+            (providerSelection?.providerType === 'plugin' &&
+                target.activePlugin?.id !== providerSelection.providerId) ||
+            (providerSelection?.providerType === 'ollama' && target.activePlugin)) {
+            throw new Error('The selected title provider is unavailable.');
+        }
+        const { tools: _tools, ...textOptions } = target.mergedOptions;
         const prompt = buildTitlePrompt(message);
         if (target.activePlugin) {
             const pluginResponse = await this.pluginService.executePluginRequest(target.actualModelName, [
@@ -153,7 +208,7 @@ export class TitleGenerationService {
                     content: prompt,
                     timestamp: this.now(),
                 },
-            ], { ...target.mergedOptions, ...PLUGIN_TITLE_GENERATION_OPTIONS }, userId, target.activePlugin.id);
+            ], { ...textOptions, ...PLUGIN_TITLE_GENERATION_OPTIONS }, userId, target.activePlugin.id);
             return {
                 title: this.chatGenerationService.extractPluginAssistantContent(pluginResponse),
                 source: 'plugin',
@@ -161,7 +216,7 @@ export class TitleGenerationService {
         }
         // Ollama takes the thinking setting beside the options, never inside
         // them, and this call answers it for itself below.
-        const { think: _think, ...ollamaOptions } = target.mergedOptions;
+        const { think: _think, ...ollamaOptions } = textOptions;
         const response = await this.ollamaService.generateResponse({
             model: target.actualModelName,
             prompt,

package/backend/dist/services/titleGenerationService.js.map

@@ -1 +1 @@
-{"version":3,"file":"titleGenerationService.js","sourceRoot":"","sources":["../../src/services/titleGenerationService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"titleGenerationService.js","sourceRoot":"","sources":["../../src/services/titleGenerationService.ts"],"names":[],"mappings":"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"}

package/backend/dist/services/workAgentService.d.ts

@@ -140,7 +140,7 @@ export declare class WorkAgentHttpError extends Error {
     readonly code: string;
     constructor(message: string, status: number, code: string);
 }
-export declare function restorePersistedWorkContext(messages: WorkMessage[], provider: Pick<WorkRun, 'providerType' | 'providerId' | 'model'>, expectedStateScope?: string): OllamaChatMessage[];
+export declare function restorePersistedWorkContext(messages: WorkMessage[], provider: Pick<WorkRun, 'providerType' | 'providerId' | 'model'>, expectedStateScope?: string, expectedUserId?: string): OllamaChatMessage[];
 export declare function normalizeToolCalls(response: OllamaChatResponse): WorkToolCall[];
 export declare const workAgentService: WorkAgentService;
 export default workAgentService;

package/backend/dist/services/workAgentService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workAgentService.d.ts","sourceRoot":"","sources":["../../src/services/workAgentService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"workAgentService.d.ts","sourceRoot":"","sources":["../../src/services/workAgentService.ts"],"names":[],"mappings":"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"}

package/backend/dist/services/workAgentService.js

@@ -14,6 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { isWorkDshModel } from '../cordis/work-model.js';
 import workModelProviderService, { WORK_TOOL_ARGUMENTS_ERROR_METADATA_KEY, WORK_TOOL_ARGUMENTS_ERROR_MESSAGE, } from './workModelProviderService.js';
 import workEventService from './workEventService.js';
 import { buildWorkAgentSystemPrompt, buildWorkBudgetExhaustionPrompt, buildWorkComputerAmbiguityPrompt, buildWorkComputerStallPrompt, buildWorkEmptyRoundNudgePrompt, buildWorkScreenshotsUnsupportedPrompt, buildWorkStatusBlurbPrompt, workAgentSkillsForContext, WORK_WRITE_FILE_RECOMMENDED_CHARS, workToolCallBudget, } from './workAgentGuidance.js';
@@ -574,6 +575,7 @@ export class WorkAgentService {
         let runDelegation;
         let releaseExecutionLease;
         let executionContainerSettled = false;
+        let dshDriver;
         // Files this run created, moved, or deleted, in first-touch order. They
         // are persisted with the run so the workspace chips survive a reload.
         const changedFiles = [];
@@ -700,6 +702,9 @@ export class WorkAgentService {
                     description: 'Taught procedure demonstrated by the user.',
                 }, `skill:taught:${skill.slug}`, durableAttemptIdentity);
             }
+            if (run.providerType === 'dsh') {
+                await workModelProviderService.assertModelSupportsTools(run.model, { providerType: run.providerType, providerId: run.providerId }, userId);
+            }
             releaseExecutionLease = await workRuntimeService.prepare(task, controller.signal);
             await this.throwIfCancelled(runId, controller);
             await workTaskService.updateRun(runId, 'running', { started: true });
@@ -712,6 +717,12 @@ export class WorkAgentService {
             };
             const providerRoutingFingerprint = await workModelProviderService.getRoutingFingerprint(run.model, providerSelection, userId);
             const providerStateScope = await workModelProviderService.getResponsesStateScope(run.model, providerSelection, userId);
+            if (run.providerType === 'dsh' || isWorkDshModel(run.model)) {
+                const { createWorkDshDriver } = await import('../cordis/dsh/work-driver.js');
+                dshDriver = await createWorkDshDriver({
+                    generate: (request, observer, signal) => workModelProviderService.generateChatStreamResponse(request, providerSelection, userId, observer, signal),
+                });
+            }
             // A5 approvals: whether side-effecting tool calls pause for review.
             // Resolved once per run — the policy force-flag or the task opt-in;
             // per-call rules are re-read at gate time so an Always-allow decision
@@ -807,7 +818,9 @@ export class WorkAgentService {
                 let response;
                 try {
                     await this.assertStableProviderRouting(run, userId, providerRoutingFingerprint);
-                    response = await workModelProviderService.generateChatStreamResponse({
+                    response = await (dshDriver
+                        ? dshDriver.generate.bind(dshDriver)
+                        : (request, observer, signal) => workModelProviderService.generateChatStreamResponse(request, providerSelection, userId, observer, signal))({
                         model: run.model,
                         messages,
                         tools: [
@@ -817,7 +830,7 @@ export class WorkAgentService {
                             ...(externalTools?.schemas ?? []),
                         ],
                         stream: true,
-                    }, providerSelection, userId, {
+                    }, {
                         onContent: delta => contentStream.push(delta),
                         onReasoning: delta => reasoningStream.push(delta),
                         onUsage: usage => {
@@ -881,7 +894,15 @@ export class WorkAgentService {
                         undefined ||
                     providerMetadata?.[OPENAI_RESPONSES_STATE_SCOPE_METADATA_KEY] !==
                         undefined;
-                const providerStateMetadata = toPersistedWorkProviderState(run, providerMetadata);
+                const nativeStateMetadata = run.providerType === 'dsh'
+                    ? toPersistedWorkChatToolCalls(run, toolCalls, boundUtf8(response.message.thinking?.trim() ?? '', 100000), { userId, metadata: objectValue(providerMetadata?.nativeDsh) })
+                    : undefined;
+                if (run.providerType === 'dsh' &&
+                    providerMetadata?.nativeDsh &&
+                    !nativeStateMetadata)
+                    throw new WorkAgentHttpError('The native provider replay state exceeds the durable Work context limit.', 502, 'WORK_PROVIDER_INVALID_TOOL_CALLS');
+                const providerStateMetadata = toPersistedWorkProviderState(run, providerMetadata) ??
+                    nativeStateMetadata;
                 if (toolCalls.length > 0 &&
                     (providerStateScope || hasResponsesStateMetadata) &&
                     (providerMetadata?.[OPENAI_RESPONSES_STATE_DROPPED_METADATA_KEY] ===
@@ -915,6 +936,9 @@ export class WorkAgentService {
                             messages.push({
                                 role: 'assistant',
                                 content: '',
+                                ...(run.providerType === 'dsh' && reasoningContent
+                                    ? { thinking: reasoningContent }
+                                    : {}),
                                 providerMetadata: response.message.providerMetadata,
                             });
                         }
@@ -1000,6 +1024,9 @@ export class WorkAgentService {
                     role: 'assistant',
                     content: assistantContent,
                     tool_calls: toolCalls,
+                    ...(run.providerType === 'dsh' && reasoningContent
+                        ? { thinking: reasoningContent }
+                        : {}),
                     ...(response.message.providerMetadata
                         ? { providerMetadata: response.message.providerMetadata }
                         : {}),
@@ -1236,7 +1263,7 @@ export class WorkAgentService {
                                 },
                             ],
                             tools: [],
-                            options: run.providerType === 'plugin'
+                            options: run.providerType !== 'ollama'
                                 ? { num_predict: 2048 }
                                 : undefined,
                             stream: true,
@@ -1412,10 +1439,15 @@ export class WorkAgentService {
         finally {
             this.controllers.delete(runId);
             try {
-                await settleExecutionContainer();
+                await dshDriver?.dispose();
             }
             finally {
-                releaseExecutionLease?.();
+                try {
+                    await settleExecutionContainer();
+                }
+                finally {
+                    releaseExecutionLease?.();
+                }
             }
         }
     }
@@ -1457,7 +1489,7 @@ export class WorkAgentService {
         }
     }
     async contextMessages(task, roundLimit, computerAvailable, taughtSkills, providerStateScope, provider = task, persona, approvalsActive, peerAgents = [], delegatedBy, connectedTools = []) {
-        const persisted = restorePersistedWorkContext(await workTaskService.getRecentModelContextMessages(task.id, 30), provider, providerStateScope);
+        const persisted = restorePersistedWorkContext(await workTaskService.getRecentModelContextMessages(task.id, 30), provider, providerStateScope, task.userId);
         return [
             {
                 role: 'system',
@@ -1978,7 +2010,7 @@ export class WorkAgentService {
                     },
                 ],
                 tools: [],
-                options: run.providerType === 'plugin' ? { num_predict: 64 } : undefined,
+                options: run.providerType !== 'ollama' ? { num_predict: 64 } : undefined,
                 stream: true,
             }, {
                 providerType: run.providerType,
@@ -2079,14 +2111,23 @@ function toPersistedWorkProviderState(run, providerMetadata) {
  * assistant/tool message pairs and silently drops every tool result — the
  * model then re-discovers its own work each turn.
  */
-function toPersistedWorkChatToolCalls(run, toolCalls) {
-    if (toolCalls.length === 0)
+function toPersistedWorkChatToolCalls(run, toolCalls, thinking, native) {
+    if (toolCalls.length === 0 && !native)
         return undefined;
     const persisted = {
         [WORK_PROVIDER_STATE_METADATA_KEY]: {
             providerType: run.providerType,
             ...(run.providerId ? { providerId: run.providerId } : {}),
             model: run.model,
+            ...(thinking ? { thinking } : {}),
+            ...(native
+                ? {
+                    userId: native.userId,
+                    ...(native.metadata
+                        ? { providerMetadata: { nativeDsh: native.metadata } }
+                        : {}),
+                }
+                : {}),
             toolCalls: toolCalls.map(call => ({
                 id: call.id,
                 name: call.function.name,
@@ -2159,7 +2200,7 @@ function persistedChatToolCalls(message) {
     }
     return calls;
 }
-export function restorePersistedWorkContext(messages, provider, expectedStateScope) {
+export function restorePersistedWorkContext(messages, provider, expectedStateScope, expectedUserId) {
     const restored = [];
     let pendingGroup;
     const flushPendingGroup = () => {
@@ -2189,6 +2230,22 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
             (message.role === 'assistant' && message.kind === 'message')) {
             flushPendingGroup();
             const providerMetadata = matchingWorkProviderMetadata(message, provider, expectedStateScope);
+            const nativeState = objectValue(message.metadata?.[WORK_PROVIDER_STATE_METADATA_KEY]);
+            const sameNativeRoute = provider.providerType === 'dsh' &&
+                nativeState?.providerType === 'dsh' &&
+                nativeState.providerId === provider.providerId &&
+                nativeState.model === provider.model;
+            const sameNativeActor = sameNativeRoute &&
+                typeof expectedUserId === 'string' &&
+                nativeState?.userId === expectedUserId;
+            const nativeThinking = sameNativeRoute &&
+                (nativeState?.userId === undefined || sameNativeActor) &&
+                typeof nativeState?.thinking === 'string'
+                ? nativeState.thinking
+                : undefined;
+            const nativeMetadata = sameNativeActor
+                ? objectValue(objectValue(nativeState?.providerMetadata)?.nativeDsh)
+                : undefined;
             // Chat-mode rounds persist their tool calls directly (no Responses
             // replay state exists for them). Restore those only when the current
             // provider requires no such state either — the strict Responses
@@ -2206,6 +2263,7 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
                 : responseCalls.length;
             const expectedCallIds = new Set(responseCalls.map(call => call.id));
             if (!providerMetadata &&
+                !nativeMetadata &&
                 message.metadata?.[WORK_EMPTY_MODEL_RESPONSE_METADATA_KEY] === true) {
                 // The empty-response placeholder informs the user; it is not
                 // something the model said, so keep it out of model context.
@@ -2213,6 +2271,7 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
             }
             if (message.kind === 'provider_state' &&
                 !providerMetadata &&
+                !nativeMetadata &&
                 !chatCalls) {
                 continue;
             }
@@ -2229,6 +2288,7 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
             const assistant = {
                 role: 'assistant',
                 content: message.content,
+                ...(nativeThinking ? { thinking: nativeThinking } : {}),
                 ...(responseCalls.length > 0
                     ? {
                         tool_calls: responseCalls.map(call => ({
@@ -2241,7 +2301,11 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
                         })),
                     }
                     : {}),
-                ...(providerMetadata ? { providerMetadata } : {}),
+                ...(providerMetadata
+                    ? { providerMetadata }
+                    : nativeMetadata
+                        ? { providerMetadata: { nativeDsh: nativeMetadata } }
+                        : {}),
             };
             if (responseCalls.length === 0) {
                 restored.push(assistant);