fix: remove shell:true default to fix command output

- Removed shell:true default that caused double shell wrapping
- This was causing echo and other commands to return empty output
- Now matches OpenClaw exec behavior which never uses shell:true
This commit is contained in:
zhi
2026-03-06 09:20:38 +00:00
parent 9c70cc33a5
commit 903e5efddb
2 changed files with 72 additions and 44 deletions

View File

@@ -11,14 +11,19 @@ const {
SlashCommandHandler
} = require('./safe-restart/dist/index.js');
// Plugin registration function (OpenClaw expects 'register' or 'activate')
// Plugin registration function
function register(api, config) {
const logger = api.logger || { info: console.log, error: console.error };
logger.info('PaddedCell plugin initializing...');
// Register pcexec tool
api.registerTool({
// Register pcexec tool - pass a FACTORY function that receives context
api.registerTool((ctx) => {
console.log(`[PaddedCell] pcexec factory called with ctx:`, JSON.stringify(ctx, null, 2));
const agentId = ctx.agentId;
const workspaceDir = ctx.workspaceDir;
return {
name: 'pcexec',
description: 'Safe exec with password sanitization',
parameters: {
@@ -30,16 +35,36 @@ function register(api, config) {
},
required: ['command'],
},
async handler(params) {
return await pcexec(params.command, {
cwd: params.cwd,
async execute(_id, params) {
const command = params.command;
if (!command) {
throw new Error('Missing required parameter: command');
}
console.log(`[PaddedCell] pcexec execute: agentId=${agentId}, workspaceDir=${workspaceDir}`);
const result = await pcexec(command, {
cwd: params.cwd || workspaceDir,
timeout: params.timeout,
});
env: {
AGENT_ID: agentId || '',
AGENT_WORKSPACE: workspaceDir || '',
},
});
// Format output for OpenClaw tool response
let output = result.stdout;
if (result.stderr) {
output += result.stderr;
}
return { content: [{ type: 'text', text: output }] };
},
};
});
// Register safe_restart tool
api.registerTool({
// Register safe_restart tool - pass a FACTORY function that receives context
api.registerTool((ctx) => {
const agentId = ctx.agentId;
const sessionKey = ctx.sessionKey;
return {
name: 'safe_restart',
description: 'Safe coordinated restart of OpenClaw gateway',
parameters: {
@@ -49,14 +74,15 @@ function register(api, config) {
log: { type: 'string', description: 'Log file path' },
},
},
async handler(params, context) {
async execute(_id, params) {
return await safeRestart({
agentId: context.agentId,
sessionKey: context.sessionKey,
agentId: agentId,
sessionKey: sessionKey,
rollback: params.rollback,
log: params.log,
});
},
};
});
logger.info('PaddedCell plugin initialized');

View File

@@ -201,7 +201,8 @@ export async function pcexec(command: string, options: PcExecOptions = {}): Prom
const spawnOptions: SpawnOptions = {
cwd: options.cwd,
env,
shell: options.shell ?? true,
// Don't use shell by default - we're already using bash -c explicitly
shell: options.shell,
windowsHide: options.windowsHide,
uid: options.uid,
gid: options.gid,
@@ -327,7 +328,8 @@ export function pcexecSync(command: string, options: PcExecOptions = {}): PcExec
const execOptions: any = {
cwd: options.cwd,
env,
shell: options.shell ?? true,
// Don't use shell by default
shell: options.shell,
encoding: 'utf8',
windowsHide: options.windowsHide,
uid: options.uid,