You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maka.apache.org by li...@apache.org on 2026/10/23 01:14:13 UTC

(maka) 01/01: fix(cli): enforce ownership for session controls

This is an automated email from the ASF dual-hosted git repository.

liugddx pushed a commit to branch fix/session-control-execution-boundary
in repository https://gitbox.apache.org/repos/asf/maka.git

commit db1c9ca528182c2ccf1b4cc0fc660a693f8ea9a7
Author: Guangdong Liu <80...@qq.com>
AuthorDate: Fri Oct 23 09:13:51 2026 +0800

    fix(cli): enforce ownership for session controls
---
 .../cli/src/__tests__/run-session-boundary.test.ts | 32 ++++++++++++++++++++++
 packages/cli/src/run-session-command.ts            | 19 ++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/__tests__/run-session-boundary.test.ts b/packages/cli/src/__tests__/run-session-boundary.test.ts
new file mode 100644
index 0000000000..512646ec82
--- /dev/null
+++ b/packages/cli/src/__tests__/run-session-boundary.test.ts
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { sessionControlRequiresExecutionBoundary } from '../run-session-command.js';
+
+test('ownership checks cover every Session control that can mutate a Turn', () => {
+  assert.equal(sessionControlRequiresExecutionBoundary({}), false);
+  assert.equal(sessionControlRequiresExecutionBoundary({ prompt: 'run' }), true);
+  assert.equal(sessionControlRequiresExecutionBoundary({ answers: [] }), true);
+  assert.equal(sessionControlRequiresExecutionBoundary({ resumeExecution: true }), true);
+  assert.equal(sessionControlRequiresExecutionBoundary({ sandboxDecision: 'allow' }), true);
+  assert.equal(sessionControlRequiresExecutionBoundary({ sandboxDecision: 'deny' }), true);
+  assert.equal(sessionControlRequiresExecutionBoundary({ stop: true }), true);
+});
diff --git a/packages/cli/src/run-session-command.ts b/packages/cli/src/run-session-command.ts
index c07f482605..5ef77a2318 100644
--- a/packages/cli/src/run-session-command.ts
+++ b/packages/cli/src/run-session-command.ts
@@ -36,6 +36,22 @@ import type { MakaRunEnvironmentDeps, MakaRunOptions } from './run-command-core.
 import { RunSessionInterrupted, type MakaRunSessionResult } from './run-session-result.js';
 import { TurnOutcomeClassifier, acceptStoredTurn } from './run-turn-outcome.js';
 
+/** Session controls that must verify ownership before mutating a Host-owned Turn. */
+export function sessionControlRequiresExecutionBoundary(
+  options: Pick<
+    MakaRunOptions,
+    'prompt' | 'answers' | 'resumeExecution' | 'sandboxDecision' | 'stop'
+  >,
+): boolean {
+  return (
+    options.prompt !== undefined ||
+    options.answers !== undefined ||
+    options.resumeExecution === true ||
+    options.sandboxDecision !== undefined ||
+    options.stop === true
+  );
+}
+
 /** Session commands observe Host-owned execution; they never publish client MCP. */
 export async function runMakaSessionCommand(
   connection: RuntimeHostConnection,
@@ -47,6 +63,7 @@ export async function runMakaSessionCommand(
   const executing =
     options.prompt !== undefined || options.answers !== undefined || options.resumeExecution;
   const decidingSandbox = options.sandboxDecision !== undefined;
+  const controllingTurn = sessionControlRequiresExecutionBoundary(options);
   if ((executing || decidingSandbox) && !allowDetach)
     throw new Error(
       'Session control execution requires a persistent installation; use the blocking legacy run path for temporary npx invocations',
@@ -119,7 +136,7 @@ export async function runMakaSessionCommand(
     let admittedQueueRevision: number | undefined;
     let admittedQueueEpoch: string | undefined;
     let fullAccess = false;
-    if (executing) {
+    if (controllingTurn) {
       const boundary = await connection.request('session.execution_boundary.query', { sessionId });
       assertActive();
       if (boundary.kind === 'external')


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@maka.apache.org
For additional commands, e-mail: commits-help@maka.apache.org