libre-webui 0.37.2 → 0.39.0

package/backend/dist/services/workAgentService.js

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { isWorkDshModel } from '../cordis/work-model.js';
+import { isWorkStrandsModel } from '../strands/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';
@@ -575,7 +575,7 @@ export class WorkAgentService {
         let runDelegation;
         let releaseExecutionLease;
         let executionContainerSettled = false;
-        let dshDriver;
+        let strandsDriver;
         // 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 = [];
@@ -702,7 +702,7 @@ export class WorkAgentService {
                     description: 'Taught procedure demonstrated by the user.',
                 }, `skill:taught:${skill.slug}`, durableAttemptIdentity);
             }
-            if (run.providerType === 'dsh') {
+            if (isWorkStrandsModel(run.model)) {
                 await workModelProviderService.assertModelSupportsTools(run.model, { providerType: run.providerType, providerId: run.providerId }, userId);
             }
             releaseExecutionLease = await workRuntimeService.prepare(task, controller.signal);
@@ -717,9 +717,9 @@ 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({
+            if (isWorkStrandsModel(run.model)) {
+                const { createWorkStrandsDriver } = await import('../strands/work-driver.js');
+                strandsDriver = await createWorkStrandsDriver({
                     generate: (request, observer, signal) => workModelProviderService.generateChatStreamResponse(request, providerSelection, userId, observer, signal),
                 });
             }
@@ -818,8 +818,8 @@ export class WorkAgentService {
                 let response;
                 try {
                     await this.assertStableProviderRouting(run, userId, providerRoutingFingerprint);
-                    response = await (dshDriver
-                        ? dshDriver.generate.bind(dshDriver)
+                    response = await (strandsDriver
+                        ? strandsDriver.generate.bind(strandsDriver)
                         : (request, observer, signal) => workModelProviderService.generateChatStreamResponse(request, providerSelection, userId, observer, signal))({
                         model: run.model,
                         messages,
@@ -830,6 +830,9 @@ export class WorkAgentService {
                             ...(externalTools?.schemas ?? []),
                         ],
                         stream: true,
+                        ...(run.think !== undefined
+                            ? { options: { think: run.think } }
+                            : {}),
                     }, {
                         onContent: delta => contentStream.push(delta),
                         onReasoning: delta => reasoningStream.push(delta),
@@ -894,15 +897,7 @@ export class WorkAgentService {
                         undefined ||
                     providerMetadata?.[OPENAI_RESPONSES_STATE_SCOPE_METADATA_KEY] !==
                         undefined;
-                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;
+                const providerStateMetadata = toPersistedWorkProviderState(run, providerMetadata);
                 if (toolCalls.length > 0 &&
                     (providerStateScope || hasResponsesStateMetadata) &&
                     (providerMetadata?.[OPENAI_RESPONSES_STATE_DROPPED_METADATA_KEY] ===
@@ -936,9 +931,6 @@ export class WorkAgentService {
                             messages.push({
                                 role: 'assistant',
                                 content: '',
-                                ...(run.providerType === 'dsh' && reasoningContent
-                                    ? { thinking: reasoningContent }
-                                    : {}),
                                 providerMetadata: response.message.providerMetadata,
                             });
                         }
@@ -1024,9 +1016,6 @@ export class WorkAgentService {
                     role: 'assistant',
                     content: assistantContent,
                     tool_calls: toolCalls,
-                    ...(run.providerType === 'dsh' && reasoningContent
-                        ? { thinking: reasoningContent }
-                        : {}),
                     ...(response.message.providerMetadata
                         ? { providerMetadata: response.message.providerMetadata }
                         : {}),
@@ -1439,7 +1428,7 @@ export class WorkAgentService {
         finally {
             this.controllers.delete(runId);
             try {
-                await dshDriver?.dispose();
+                await strandsDriver?.dispose();
             }
             finally {
                 try {
@@ -2111,23 +2100,14 @@ 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, thinking, native) {
-    if (toolCalls.length === 0 && !native)
+function toPersistedWorkChatToolCalls(run, toolCalls) {
+    if (toolCalls.length === 0)
         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,
@@ -2200,7 +2180,7 @@ function persistedChatToolCalls(message) {
     }
     return calls;
 }
-export function restorePersistedWorkContext(messages, provider, expectedStateScope, expectedUserId) {
+export function restorePersistedWorkContext(messages, provider, expectedStateScope, _expectedUserId) {
     const restored = [];
     let pendingGroup;
     const flushPendingGroup = () => {
@@ -2230,22 +2210,6 @@ 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
@@ -2263,7 +2227,6 @@ 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.
@@ -2271,7 +2234,6 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
             }
             if (message.kind === 'provider_state' &&
                 !providerMetadata &&
-                !nativeMetadata &&
                 !chatCalls) {
                 continue;
             }
@@ -2288,7 +2250,6 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
             const assistant = {
                 role: 'assistant',
                 content: message.content,
-                ...(nativeThinking ? { thinking: nativeThinking } : {}),
                 ...(responseCalls.length > 0
                     ? {
                         tool_calls: responseCalls.map(call => ({
@@ -2301,11 +2262,7 @@ export function restorePersistedWorkContext(messages, provider, expectedStateSco
                         })),
                     }
                     : {}),
-                ...(providerMetadata
-                    ? { providerMetadata }
-                    : nativeMetadata
-                        ? { providerMetadata: { nativeDsh: nativeMetadata } }
-                        : {}),
+                ...(providerMetadata ? { providerMetadata } : {}),
             };
             if (responseCalls.length === 0) {
                 restored.push(assistant);