@cloudcli-ai/cloudcli 1.36.2 → 1.37.0

package/server/shared/interfaces.ts

@@ -1,4 +1,5 @@
 import type {
+  AnyRecord,
   FetchHistoryOptions,
   FetchHistoryResult,
   LLMProvider,
@@ -7,17 +8,36 @@ import type {
   ProviderSkill,
   ProviderSkillListOptions,
   ProviderAuthStatus,
-  ProviderChangeActiveModelInput,
   ProviderCurrentActiveModel,
   ProviderModelsDefinition,
   ProviderMcpServer,
-  ProviderSessionActiveModelChange,
   ProviderSkillCreateInput,
   ProviderSkillRemoveInput,
+  ProviderRuntimeContext,
+  ProviderRuntimePermissionGateway,
+  ProviderRuntimeWriter,
   UpsertProviderMcpServerInput,
 } from '@/shared/types.js';
 
 //----------------- PROVIDER CONTRACT INTERFACES ------------
+
+/**
+ * Live execution contract implemented by each provider SDK/CLI adapter.
+ *
+ * The provider registry owns this adapter as one facet of `IProvider`; runtime
+ * execution context is supplied by the application service at call time.
+ */
+export interface IProviderRuntime {
+  run(
+    command: string,
+    options: AnyRecord,
+    writer: ProviderRuntimeWriter,
+    context: ProviderRuntimeContext,
+  ): Promise<unknown>;
+  abort(sessionId: string): boolean | Promise<boolean>;
+  permissions?: ProviderRuntimePermissionGateway;
+}
+
 /**
  * Main provider contract for CLI and SDK integrations.
  *
@@ -26,6 +46,7 @@ import type {
  */
 export interface IProvider {
   readonly id: LLMProvider;
+  readonly runtime: IProviderRuntime;
   readonly models: IProviderModels;
   readonly mcp: IProviderMcp;
   readonly auth: IProviderAuth;
@@ -52,26 +73,15 @@ export interface IProviderModels {
   getSupportedModels(): Promise<ProviderModelsDefinition>;
 
   /**
-   * Returns the currently active model for one session or provider runtime.
+   * Reads the model the provider itself believes one session is running with.
    *
-   * Implementations must use the provider-specific lookup mechanism approved
-   * for that provider and fall back only to the provider catalog default when
-   * no active model can be resolved.
+   * Only consulted for sessions the app has never recorded a model for — a
+   * session started directly in the provider CLI, for example. Selecting a
+   * model in the app is persisted on the session row instead, so adapters here
+   * are read-only and must fall back to the catalog default when the
+   * provider-specific lookup finds nothing.
    */
   getCurrentActiveModel(sessionId?: string): Promise<ProviderCurrentActiveModel>;
-
-  /**
-   * Persists a session-scoped model override that the next resumed turn should
-   * honor for this provider.
-   *
-   * This does not require the provider to mutate an already running remote
-   * session in-place. Instead, adapters store the user's explicit model choice
-   * so the backend resume path can add the correct provider-native model option
-   * on the next CLI/SDK invocation for the same session.
-   */
-  changeActiveModel(
-    input: ProviderChangeActiveModelInput,
-  ): Promise<ProviderSessionActiveModelChange>;
 }
 
 // ---------------------------

package/server/shared/tests/image-attachments.test.ts

@@ -5,11 +5,15 @@ import path from 'node:path';
 import test from 'node:test';
 
 import {
+  appendFilesInputTag,
   appendImagesInputTag,
   buildClaudeUserContent,
   buildCodexInputItems,
+  isImageAttachmentDescriptor,
+  normalizeAttachmentDescriptors,
   isAllowedImageSourcePath,
   normalizeImageDescriptors,
+  parseFilesInputTag,
   parseImagesInputTag,
   resolveImageMediaType,
   toImageAttachments,
@@ -65,6 +69,57 @@ test('normalizeImageDescriptors accepts objects and bare paths, drops junk', ()
   assert.deepEqual(normalizeImageDescriptors('not-an-array'), []);
 });
 
+test('normalizeAttachmentDescriptors preserves file metadata and identifies images', () => {
+  const [pdf, image] = normalizeAttachmentDescriptors([
+    { path: 'brief.pdf', name: 'brief.pdf', mimeType: 'application/pdf', size: 4096 },
+    { path: 'diagram.PNG' },
+  ]);
+
+  assert.deepEqual(pdf, {
+    path: 'brief.pdf',
+    name: 'brief.pdf',
+    mimeType: 'application/pdf',
+    size: 4096,
+  });
+  assert.equal(isImageAttachmentDescriptor(pdf), false);
+  assert.equal(isImageAttachmentDescriptor(image), true);
+});
+
+test('appendFilesInputTag and parseFilesInputTag round-trip non-image files', () => {
+  const prompt = 'Summarize the attached materials.';
+  const tagged = appendFilesInputTag(prompt, [
+    { path: 'C:\\Users\\x\\.cloudcli\\assets\\brief.pdf', name: 'Brief (final).pdf' },
+    { path: '/tmp/cloudcli-assets/data.csv', name: 'data.csv' },
+  ]);
+
+  assert.ok(tagged.includes('<files_input>'));
+  assert.ok(tagged.includes('The user attached 2 file(s)'));
+  assert.deepEqual(parseFilesInputTag(tagged), {
+    text: prompt,
+    filePaths: [
+      'C:/Users/x/.cloudcli/assets/brief.pdf',
+      '/tmp/cloudcli-assets/data.csv',
+    ],
+    attachments: [
+      { path: 'C:/Users/x/.cloudcli/assets/brief.pdf', name: 'Brief final.pdf' },
+      { path: '/tmp/cloudcli-assets/data.csv', name: 'data.csv' },
+    ],
+  });
+});
+
+test('parseFilesInputTag handles Windows-flattened provider prompts', () => {
+  const flattened = appendFilesInputTag(
+    'inspect this',
+    [{ path: 'C:/Users/x/.cloudcli/assets/report.docx', name: 'report.docx' }],
+  ).replace(/\s*\r?\n\s*/g, ' ');
+
+  const parsed = parseFilesInputTag(flattened);
+  assert.equal(parsed.text, 'inspect this');
+  assert.deepEqual(parsed.attachments, [
+    { path: 'C:/Users/x/.cloudcli/assets/report.docx', name: 'report.docx' },
+  ]);
+});
+
 test('appendImagesInputTag and parseImagesInputTag round-trip', () => {
   const prompt = 'Describe these screenshots.\n\nFocus on the header.';
   const tagged = appendImagesInputTag(prompt, [