hansjone/dsh-im-ops
1
0
Fork 0
mirror of https://github.com/hansjone/dsh-im-ops.git synced 2026-10-14 05:50:47 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Recreate IM sessions when a bound Session is outside the bot workspace.

Browse source 
Avoid HARNESS_SERVICE from zombie bindings after workspace switches by verifying membership and creating with the configured workspace, preset, and default model.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-09-16 20:22:26 +08:00
parent 74c58bdcde
commit 303ca34177
5 changed files with 213 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/channels/shared/harness-client.mjs
View file

@ -1,6 +1,6 @@
import { spawn } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { isAbsolute } from 'node:path';
import { isAbsolute, resolve } from 'node:path';
import { adoptRegisteredWorkspaceSession } from './harness-session-binding.mjs';
import {
@ -981,6 +981,39 @@ export class HarnessClient {
}
}
/**
* Whether a Session is registered under the given workspace path.
* Prefers session.list `cwd`, then workspace.list membership.
*/
async sessionBelongsToWorkspace(sessionId, workspacePath, options = {}) {
if (typeof sessionId !== 'string' || !sessionId) return false;
if (typeof workspacePath !== 'string' || !workspacePath.trim()) return false;
const wanted = resolve(workspacePath.trim());
const samePath = (value) => {
if (typeof value !== 'string' || !value.trim()) return false;
const got = resolve(value.trim());
return process.platform === 'win32'
? got.toLowerCase() === wanted.toLowerCase()
: got === wanted;
};
const sessionList = await this.rpc('session.list', {}, 30_000, options);
if (!sessionList || typeof sessionList !== 'object' || !Array.isArray(sessionList.items)) {
throw new Error('Harness returned an invalid response for session.list');
}
const item = sessionList.items.find((entry) => entry?.sessionId === sessionId);
if (!item) return false;
if (typeof item.cwd === 'string' && item.cwd.trim()) return samePath(item.cwd);
const workspaceList = await this.rpc('workspace.list', {}, 30_000, options);
const workspace = workspaceFromList(wanted, workspaceList)
?? (Array.isArray(workspaceList?.items)
? workspaceList.items.find((entry) => samePath(entry?.path))
: null);
if (!workspace) return false;
return Array.isArray(workspace.sessionIds) && workspace.sessionIds.includes(sessionId);
}
async respondInteraction(rpcId, result, options = {}) {
if (typeof rpcId !== 'string' || !rpcId) throw new TypeError('rpcId is required');
if (!result || typeof result !== 'object' || typeof result.ok !== 'boolean') {