@greppleai/grip 0.0.1 → 0.1.3

package/dist/modes/interactive/interactive-mode.js

@@ -21,7 +21,7 @@ import { defaultModelPerProvider, findExactModelReferenceMatch, resolveModelScop
 import { DefaultPackageManager } from "../../core/package-manager.js";
 import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "../../core/provider-display-names.js";
 import { formatSandboxList, formatSandboxStartResult, formatSandboxStopResult, parseSandboxUserCommand, } from "../../core/sandbox/command.js";
-import { DockerSandboxService, redactSecrets, } from "../../core/sandbox/docker.js";
+import { redactSecrets, } from "../../core/sandbox/config.js";
 import { LimaSandboxService } from "../../core/sandbox/lima.js";
 import { LocalSessionManager } from "../../core/session/local-session-manager.js";
 import { formatMissingSessionCwdPrompt, MissingSessionCwdError } from "../../core/session-cwd.js";
@@ -253,10 +253,8 @@ export class InteractiveMode {
     // Tool output expansion state
     toolOutputExpanded = false;
     activeSandboxContainerId;
-    activeSandboxRuntime;
     activeSandboxBackendConnected = false;
     sessionSandboxStates = new Map();
-    managedSandboxContainers = new Map();
     managedLimaInstances = new Map();
     // Thinking block visibility state
     hideThinkingBlock = false;
@@ -2640,6 +2638,8 @@ export class InteractiveMode {
         const submittedText = text.trim();
         if (!submittedText)
             return;
+        // Keep attempted commands as well as accepted prompts available through editor history.
+        this.editor.addToHistory?.(submittedText);
         if (await this.handleBuiltInEditorCommand(submittedText))
             return;
         if (await this.handleBashEditorSubmission(submittedText))
@@ -4952,6 +4952,7 @@ export class InteractiveMode {
             this.editorContainer.clear();
             this.editorContainer.addChild(editor);
             this.ui.setFocus(editor);
+            this.updateToolBackendStatus();
             this.ui.requestRender();
         };
         try {
@@ -5230,12 +5231,6 @@ export class InteractiveMode {
         this.setupAutocompleteProvider();
         this.showLoadedResources({ force: true, showDiagnosticsWhenQuiet: true });
     }
-    createDockerSandboxService() {
-        return new DockerSandboxService({
-            settingsManager: this.settingsManager,
-            managedContainers: this.managedSandboxContainers,
-        });
-    }
     createLimaSandboxService() {
         return new LimaSandboxService({
             settingsManager: this.settingsManager,
@@ -5243,7 +5238,6 @@ export class InteractiveMode {
         });
     }
     async disposeRuntimeResources() {
-        const dockerSandboxService = this.createDockerSandboxService();
         const limaSandboxService = this.createLimaSandboxService();
         const errors = [];
         try {
@@ -5253,7 +5247,7 @@ export class InteractiveMode {
             errors.push(error instanceof Error ? error : new Error(String(error)));
         }
         try {
-            await Promise.all([dockerSandboxService.stopManagedContainers(), limaSandboxService.stopManagedInstances()]);
+            await limaSandboxService.stopManagedInstances();
         }
         catch (error) {
             errors.push(error instanceof Error ? error : new Error(String(error)));
@@ -5262,13 +5256,11 @@ export class InteractiveMode {
     }
     async restoreCurrentSessionSandbox() {
         this.activeSandboxContainerId = undefined;
-        this.activeSandboxRuntime = undefined;
         this.activeSandboxBackendConnected = false;
         const state = this.sessionSandboxStates.get(getSessionSandboxKey(this.activeSession));
         if (!state)
             return;
         this.activeSandboxContainerId = state.containerId;
-        this.activeSandboxRuntime = state.runtime ?? "docker";
         try {
             await this.session.activateSandboxDaemon({
                 url: state.url,
@@ -5286,7 +5278,6 @@ export class InteractiveMode {
     hasSandboxActivationConflict(sessionKey) {
         return (this.activeSandboxBackendConnected ||
             this.activeSandboxContainerId !== undefined ||
-            [...this.managedSandboxContainers.values()].some((container) => container.ownerId === this.activeSession.getSessionId()) ||
             [...(this.managedLimaInstances?.values() ?? [])].some((instance) => instance.ownerId === this.activeSession.getSessionId()) ||
             this.sessionSandboxStates.has(sessionKey));
     }
@@ -5300,13 +5291,12 @@ export class InteractiveMode {
         if (!this.activeSandboxBackendConnected && this.sessionSandboxStates.has(sessionKey)) {
             this.sessionSandboxStates.delete(sessionKey);
             this.activeSandboxContainerId = undefined;
-            this.activeSandboxRuntime = undefined;
             this.showStatus("Stale sandbox state cleared");
             return;
         }
         await this.session.clearRemoteSandbox();
         this.sessionSandboxStates.delete(sessionKey);
-        this.activeSandboxRuntime = undefined;
+        this.activeSandboxContainerId = undefined;
         this.activeSandboxBackendConnected = false;
         this.refreshUiAfterBackendChange();
         this.updateToolBackendStatus();
@@ -5320,7 +5310,6 @@ export class InteractiveMode {
         const token = process.env.GRIP_REMOTE_TOKEN ?? "";
         const info = await this.session.activateSandboxDaemon({ url, token, expectedCwd });
         this.activeSandboxContainerId = undefined;
-        this.activeSandboxRuntime = undefined;
         this.activeSandboxBackendConnected = true;
         this.sessionSandboxStates.set(sessionKey, { type: "daemon", url, token, expectedCwd });
         this.refreshUiAfterBackendChange();
@@ -5368,10 +5357,15 @@ export class InteractiveMode {
         if (info)
             return info;
         const activationError = lastActivationError instanceof Error ? lastActivationError : new Error(String(lastActivationError));
+        if (result.daemonUrl.startsWith("grip+ws:")) {
+            // A shared-VM attach owns only its channel, never the VM or guest daemon.
+            this.activeSandboxContainerId = undefined;
+            this.activeSandboxBackendConnected = false;
+            throw activationError;
+        }
         try {
             await service.stop({ workspaceRoot, currentContainerId: result.containerId });
             this.activeSandboxContainerId = undefined;
-            this.activeSandboxRuntime = undefined;
             this.activeSandboxBackendConnected = false;
         }
         catch (cleanupError) {
@@ -5382,18 +5376,24 @@ export class InteractiveMode {
         }
         throw activationError;
     }
-    async startSandboxBackend(command, service, workspaceRoot, sessionKey, runtime) {
+    async startSandboxBackend(command, service, workspaceRoot, sessionKey, updatingAttached = false) {
         const loader = this.showSandboxStartupLoader();
         try {
             const result = await service.start({
                 workspaceRoot,
-                ...(command.image ? { image: command.image } : {}),
                 ...(command.name ? { name: command.name } : {}),
                 ...(command.template ? { limaTemplate: command.template } : {}),
+                ...(command.update ? { update: true } : {}),
                 sessionId: this.activeSession.getSessionId(),
             });
+            if (updatingAttached) {
+                await this.session.abort();
+                await this.session.clearRemoteSandbox();
+                this.sessionSandboxStates.delete(sessionKey);
+                this.activeSandboxContainerId = undefined;
+                this.activeSandboxBackendConnected = false;
+            }
             this.activeSandboxContainerId = result.containerId;
-            this.activeSandboxRuntime = runtime;
             const info = await this.activateStartedSandbox(service, workspaceRoot, result);
             this.activeSandboxBackendConnected = true;
             this.sessionSandboxStates.set(sessionKey, {
@@ -5402,11 +5402,15 @@ export class InteractiveMode {
                 token: result.token,
                 expectedCwd: result.workspaceMountPath,
                 containerId: result.containerId,
-                runtime,
             });
             this.refreshUiAfterBackendChange();
             this.updateToolBackendStatus();
-            this.showStatus([formatSandboxStartResult(result), this.formatToolBackendStatus(info)].join("\n"));
+            this.showStatus([
+                command.update
+                    ? formatSandboxStartResult(result).replace("Sandbox started:", "Sandbox updated:")
+                    : formatSandboxStartResult(result),
+                this.formatToolBackendStatus(info),
+            ].join("\n"));
         }
         finally {
             this.hideSandboxStartupLoader(loader);
@@ -5435,7 +5439,6 @@ export class InteractiveMode {
             }
             this.sessionSandboxStates.delete(sessionKey);
             this.activeSandboxContainerId = undefined;
-            this.activeSandboxRuntime = undefined;
             this.activeSandboxBackendConnected = false;
             return;
         }
@@ -5449,7 +5452,6 @@ export class InteractiveMode {
         }
         if (stoppedActiveSandbox) {
             this.activeSandboxContainerId = undefined;
-            this.activeSandboxRuntime = undefined;
             this.activeSandboxBackendConnected = false;
         }
     }
@@ -5463,6 +5465,20 @@ export class InteractiveMode {
             this.showStatus("Sandbox detached");
             return;
         }
+        const attached = this.sessionSandboxStates.get(sessionKey);
+        if (attached?.url?.startsWith("grip+ws:") &&
+            attached.containerId === this.activeSandboxContainerId &&
+            (!target || target === attached.containerId)) {
+            if (this.activeSandboxBackendConnected)
+                await this.session.clearRemoteSandbox();
+            this.sessionSandboxStates.delete(sessionKey);
+            this.activeSandboxContainerId = undefined;
+            this.activeSandboxBackendConnected = false;
+            this.refreshUiAfterBackendChange();
+            this.updateToolBackendStatus();
+            this.showStatus("Shared sandbox detached; VM and guest daemon remain running");
+            return;
+        }
         const result = await service.stop({
             workspaceRoot,
             target,
@@ -5471,7 +5487,7 @@ export class InteractiveMode {
         await this.reconcileStoppedSandbox(result, sessionKey);
         this.showStatus(formatSandboxStopResult(result));
     }
-    async executeSandboxCommand(command, dockerService, workspaceRoot, sessionKey) {
+    async executeSandboxCommand(command, service, workspaceRoot, sessionKey) {
         switch (command.subcommand) {
             case "status":
                 this.showStatus(this.formatToolBackendStatus(this.session.getToolBackendInfo()));
@@ -5482,29 +5498,24 @@ export class InteractiveMode {
             case "attach":
                 if (!this.ensureSandboxCanActivate(sessionKey))
                     return;
-                await this.attachSandboxBackend(command.url, dockerService, sessionKey);
+                await this.attachSandboxBackend(command.url, service, sessionKey);
                 return;
-            case "start":
-                if (!this.ensureSandboxCanActivate(sessionKey))
+            case "start": {
+                const attached = this.sessionSandboxStates.get(sessionKey);
+                const updatingAttached = command.update === true &&
+                    attached?.url.startsWith("grip+ws:") === true &&
+                    attached.containerId === command.name &&
+                    this.activeSandboxBackendConnected;
+                if (!updatingAttached && !this.ensureSandboxCanActivate(sessionKey))
                     return;
-                {
-                    const runtime = command.runtime ?? dockerService.resolveConfig().runtime;
-                    const service = runtime === "lima" ? this.createLimaSandboxService() : dockerService;
-                    await this.startSandboxBackend(command, service, workspaceRoot, sessionKey, runtime);
-                }
+                await this.startSandboxBackend(command, service, workspaceRoot, sessionKey, updatingAttached);
                 return;
+            }
             case "list":
-                {
-                    const runtime = command.runtime ?? dockerService.resolveConfig().runtime;
-                    const service = runtime === "lima" ? this.createLimaSandboxService() : dockerService;
-                    this.showStatus(formatSandboxList(await service.list({ workspaceRoot })));
-                }
+                this.showStatus(formatSandboxList(await service.list({ workspaceRoot })));
                 return;
-            case "stop": {
-                const runtime = this.activeSandboxRuntime ?? dockerService.resolveConfig().runtime;
-                const service = runtime === "lima" ? this.createLimaSandboxService() : dockerService;
+            case "stop":
                 await this.stopSandboxBackend(command.target, service, workspaceRoot, sessionKey);
-            }
         }
     }
     async handleSandboxCommand(text) {
@@ -5516,7 +5527,7 @@ export class InteractiveMode {
             this.showWarning(error instanceof Error ? error.message : String(error));
             return;
         }
-        const service = this.createDockerSandboxService();
+        const service = this.createLimaSandboxService();
         const workspaceRoot = this.activeSession.getCwd();
         const sessionKey = getSessionSandboxKey(this.activeSession);
         try {