@github/copilot 0.0.347-3 → 0.0.347-4

package/index.js

@@ -1509,42 +1509,42 @@ Here are some examples of suggested tool calls. Follow them in tone and style.
 ${g$l(e)}
 ${E$l(l)}
 </examples>
-`;return oo(a,"copilot_swe_agent_org_instructions_priority")?(r&&(d+=`
-<repository_custom_instructions>
-${r.content}`,r.additionalInstructions&&(d+=`
-
-${r.additionalInstructions.content}`),d+=`
-</repository_custom_instructions>`),I&&(d+=`
+`;return oo(a,"copilot_swe_agent_org_instructions_priority")?(I&&(d+=`
 
 <organization_custom_instructions>
 ${I}
 </organization_custom_instructions>
-`),I&&r&&(d+=`
+`),r&&(d+=`
+<repository_custom_instructions>
+${r.content}`,r.additionalInstructions&&(d+=`
+
+${r.additionalInstructions.content}`),d+=`
+</repository_custom_instructions>`),I&&r&&(d+=`
 
 <instruction_priority>
-Manually adhere to organization custom instructions and repository custom instructions. **ALWAYS** Check if organization instructions and repository instructions conflict or contradict in any way, and if they do, you must **ALWAYS** exclusively follow organization custom instructions exclusively where they differ. You must check to thoroughly ensure the output adheres to the organization custom instructions.
+Manually adhere to repository custom instructions and organization custom instructions. **ALWAYS** Check if repository instructions and organization instructions conflict or contradict in any way, and if they do, you must **ALWAYS** exclusively follow repository custom instructions exclusively where they differ. You must check to thoroughly ensure the output adheres to the repository custom instructions.
 
 Examples of conflicts:
-- Org custom instructions: "use TypeScript" + Repo custom instructions: "use JavaScript" -> Organization custom instructions take precedence, therefore, we should use TypeScript.
-- Org custom instructions: "use npm" + Repo custom instructions: "use yarn" -> Organization custom instructions take precedence, therefore, we should use npm.
-- Org custom instructions: "prioritize internal docs" + Repo custom instructions: "check Stack Overflow first" -> Organization custom instructions take precedence, therefore, we should use internal docs.
-- Org custom instructions: "respond with bullet points" + Repo custom instructions: "respond with paragraphs" -> Organization custom instructions take precedence, therefore, we should respond with bullet points.
-- Org custom instructions: "use consistent naming conventions" + Repo custom instructions: "follow existing code style" -> Organization custom instructions take precedence, therefore, we should use consistent naming conventions.
+- Repository custom instructions: "use TypeScript" + Organization custom instructions: "use JavaScript" -> Repository custom instructions take precedence, therefore, we should use TypeScript.
+- Repository custom instructions: "use npm" + Organization custom instructions: "use yarn" -> Repository custom instructions take precedence, therefore, we should use npm.
+- Repository custom instructions: "prioritize internal docs" + Organization custom instructions: "check Stack Overflow first" -> Repository custom instructions take precedence, therefore, we should use internal docs.
+- Repository custom instructions: "respond with bullet points" + Organization custom instructions: "respond with paragraphs" -> Repository custom instructions take precedence, therefore, we should respond with bullet points.
+- Repository custom instructions: "use consistent naming conventions" + Organization custom instructions: "follow existing code style" -> Repository custom instructions take precedence, therefore, we should use consistent naming conventions.
 
-**ALWAYS** apply this rule to ALL aspects of the instructions (language, tools, format, style, approach, etc.). Before continuing, thoroughly confirm that organization custom instructions are properly adhered to.
+**ALWAYS** apply this rule to ALL aspects of the instructions (language, tools, format, style, approach, etc.). Before continuing, thoroughly confirm that repository custom instructions are properly adhered to.
 </instruction_priority>
-`)):(r&&(d+=`
+`)):(I&&(d+=`
+
+Organization custom instructions:
+${I}
+`),r&&(d+=`
 
 Custom instructions from user's \`${r.sourcePath}\`:
 ${r.content}
 `,r.additionalInstructions&&(d+=`
 Additional instructions from user's \`${r.additionalInstructions.sourcePath}\`:
 ${r.additionalInstructions.content}
-`)),I&&(d+=`
-
-Organization custom instructions:
-${I}
-`)),d+=e.parallel_tool_calls?`<tool_calling>
+`))),d+=e.parallel_tool_calls?`<tool_calling>
 ${y$l()}
 </tool_calling>`:"",d};var TOe=async(t,e,l,n={},r={},I={},a,s,o,d)=>{let u=o?void 0:await ROe(t,!0,l),b=Wye.type(),p=t===""?"":Lae(t),h=(await Promise.all(["git","curl","gh"].map(async y=>await HFt(y)!==null?y:null))).filter(y=>y!==null).join(", "),Z;if(XFt.has(l))Z=void 0;else try{let y=kFt.readdir(l,{withFileTypes:!0}).then(w=>w.filter(X=>!X.name.startsWith(".")).map(X=>{let J=Yj(l,X.name);return X.isDirectory()?J+A$l:J}).sort().join(`
 `)),Y=await bEt(y,500);typeof Y=="object"&&"timedOut"in Y?(XFt.add(l),Z=void 0):Z=Y}catch{Z=void 0}return`
@@ -1600,7 +1600,7 @@ Prefer ecosystem tools (npm init, pip install, refactoring tools, linters) over
 </using_ecosystem_tools>
 
 <style>
-Only comment code that needs a bit of clarification. Do not comment otherwise.  
+Only comment code that needs a bit of clarification. Do not comment otherwise.
 </style>
 
 </code_change_instructions>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@github/copilot",
   "description": "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal.",
-  "version": "0.0.347-3",
+  "version": "0.0.347-4",
   "type": "module",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "sdk/**/*"
   ],
   "buildMetadata": {
-    "gitCommit": "52c790c"
+    "gitCommit": "4fc774d"
   },
   "dependencies": {
     "node-pty": "npm:@devm33/node-pty@^1.0.8",

package/sdk/index.js

@@ -1123,42 +1123,42 @@ Here are some examples of suggested tool calls. Follow them in tone and style.
 ${RjI(e)}
 ${AjI(I)}
 </examples>
-`;return pl(r,"copilot_swe_agent_org_instructions_priority")?(n&&(G+=`
-<repository_custom_instructions>
-${n.content}`,n.additionalInstructions&&(G+=`
-
-${n.additionalInstructions.content}`),G+=`
-</repository_custom_instructions>`),c&&(G+=`
+`;return pl(r,"copilot_swe_agent_org_instructions_priority")?(c&&(G+=`
 
 <organization_custom_instructions>
 ${c}
 </organization_custom_instructions>
-`),c&&n&&(G+=`
+`),n&&(G+=`
+<repository_custom_instructions>
+${n.content}`,n.additionalInstructions&&(G+=`
+
+${n.additionalInstructions.content}`),G+=`
+</repository_custom_instructions>`),c&&n&&(G+=`
 
 <instruction_priority>
-Manually adhere to organization custom instructions and repository custom instructions. **ALWAYS** Check if organization instructions and repository instructions conflict or contradict in any way, and if they do, you must **ALWAYS** exclusively follow organization custom instructions exclusively where they differ. You must check to thoroughly ensure the output adheres to the organization custom instructions.
+Manually adhere to repository custom instructions and organization custom instructions. **ALWAYS** Check if repository instructions and organization instructions conflict or contradict in any way, and if they do, you must **ALWAYS** exclusively follow repository custom instructions exclusively where they differ. You must check to thoroughly ensure the output adheres to the repository custom instructions.
 
 Examples of conflicts:
-- Org custom instructions: "use TypeScript" + Repo custom instructions: "use JavaScript" -> Organization custom instructions take precedence, therefore, we should use TypeScript.
-- Org custom instructions: "use npm" + Repo custom instructions: "use yarn" -> Organization custom instructions take precedence, therefore, we should use npm.
-- Org custom instructions: "prioritize internal docs" + Repo custom instructions: "check Stack Overflow first" -> Organization custom instructions take precedence, therefore, we should use internal docs.
-- Org custom instructions: "respond with bullet points" + Repo custom instructions: "respond with paragraphs" -> Organization custom instructions take precedence, therefore, we should respond with bullet points.
-- Org custom instructions: "use consistent naming conventions" + Repo custom instructions: "follow existing code style" -> Organization custom instructions take precedence, therefore, we should use consistent naming conventions.
+- Repository custom instructions: "use TypeScript" + Organization custom instructions: "use JavaScript" -> Repository custom instructions take precedence, therefore, we should use TypeScript.
+- Repository custom instructions: "use npm" + Organization custom instructions: "use yarn" -> Repository custom instructions take precedence, therefore, we should use npm.
+- Repository custom instructions: "prioritize internal docs" + Organization custom instructions: "check Stack Overflow first" -> Repository custom instructions take precedence, therefore, we should use internal docs.
+- Repository custom instructions: "respond with bullet points" + Organization custom instructions: "respond with paragraphs" -> Repository custom instructions take precedence, therefore, we should respond with bullet points.
+- Repository custom instructions: "use consistent naming conventions" + Organization custom instructions: "follow existing code style" -> Repository custom instructions take precedence, therefore, we should use consistent naming conventions.
 
-**ALWAYS** apply this rule to ALL aspects of the instructions (language, tools, format, style, approach, etc.). Before continuing, thoroughly confirm that organization custom instructions are properly adhered to.
+**ALWAYS** apply this rule to ALL aspects of the instructions (language, tools, format, style, approach, etc.). Before continuing, thoroughly confirm that repository custom instructions are properly adhered to.
 </instruction_priority>
-`)):(n&&(G+=`
+`)):(c&&(G+=`
+
+Organization custom instructions:
+${c}
+`),n&&(G+=`
 
 Custom instructions from user's \`${n.sourcePath}\`:
 ${n.content}
 `,n.additionalInstructions&&(G+=`
 Additional instructions from user's \`${n.additionalInstructions.sourcePath}\`:
 ${n.additionalInstructions.content}
-`)),c&&(G+=`
-
-Organization custom instructions:
-${c}
-`)),G+=e.parallel_tool_calls?`<tool_calling>
+`))),G+=e.parallel_tool_calls?`<tool_calling>
 ${FjI()}
 </tool_calling>`:"",G};var wKe=async(t,e,I,l={},n={},c={},r,s,a,G)=>{let d=a?void 0:await Khe(t,!0,I),i=Hq.type(),b=t===""?"":Dhe(t),m=(await Promise.all(["git","curl","gh"].map(async u=>await FKe(u)!==null?u:null))).filter(u=>u!==null).join(", "),h;if(AKe.has(I))h=void 0;else try{let u=QKe.readdir(I,{withFileTypes:!0}).then(Y=>Y.filter(F=>!F.name.startsWith(".")).map(F=>{let g=N1(I,F.name);return F.isDirectory()?g+YjI:g}).sort().join(`
 `)),W=await mHe(u,500);typeof W=="object"&&"timedOut"in W?(AKe.add(I),h=void 0):h=W}catch{h=void 0}return`
@@ -1214,7 +1214,7 @@ Prefer ecosystem tools (npm init, pip install, refactoring tools, linters) over
 </using_ecosystem_tools>
 
 <style>
-Only comment code that needs a bit of clarification. Do not comment otherwise.  
+Only comment code that needs a bit of clarification. Do not comment otherwise.
 </style>
 
 </code_change_instructions>