Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ts/packages/defaultAgentProvider/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"prettier": "prettier --check . --ignore-path ../../.prettierignore",
"prettier:fix": "prettier --write . --ignore-path ../../.prettierignore",
"test": "pnpm run jest-esm",
"test:live": "pnpm run jest-esm --testPathPattern=\".*[.]test[.]js\"",
"test:live": "pnpm run jest-esm --testPathPattern=\".*[.]test[.]js\" --forceExit",
"test:live:debug": "node --inspect-brk --no-warnings --experimental-vm-modules ./node_modules/jest/bin/jest.js --testPathPattern=\".*\\.test\\.js\"",
"test:local": "pnpm run jest-esm --testPathPattern=\".*[.]spec[.]js\" --testPathIgnorePatterns=\"grammarNfaIntegration[.]spec[.]js\"",
"test:local:debug": "node --inspect-brk --no-warnings --experimental-vm-modules ./node_modules/jest/bin/jest.js --testPathPattern=\".*\\.spec\\.js\"",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,7 @@
"schemaName": "browser.lookupAndAnswer",
"actionName": "lookupAndAnswerInternet",
"parameters": {
"originalRequest": "look up the ingredient for shepherd's pie for me please",
"internetLookups": [
"ingredient for shepherd's pie"
]
"originalRequest": "look up the ingredient for shepherd's pie for me please"
}
},
"partial": true
Expand Down
9 changes: 9 additions & 0 deletions ts/packages/shell/src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,19 @@ async function detectRunningAgentServer(port: number): Promise<boolean> {
// latter would fail to acquire the shared instance-directory lock and abort
// startup with "Another agent-server (or shell) is already using the instance
// directory".
//
// Never probe in test mode (--test). The smoke/e2e harness launches its own
// isolated instance (per-worker INSTANCE_NAME/PORT, --mock-greetings) and must
// stay hermetic: if the probe found any agent-server on the default port — e.g.
// the detached background server the CLI smoke step leaves on 8999, or a
// developer's dogfooding session — the test shell would connect to that foreign
// server instead of hosting its own, never reach the expected ready state, and
// time out.
let effectiveConnect = parsedArgs.connect;
if (
effectiveConnect === undefined &&
!isProd &&
!isTest &&
parsedArgs.data === undefined &&
!parsedArgs.clean &&
!parsedArgs.reset &&
Expand Down
Loading